Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / drivers / scsi / mvsas.c

diff --git a/drivers/scsi/mvsas.c b/drivers/scsi/mvsas.c
index b5de3d0d3f31902ab8e09523fe0e1bfe732fd0bb..23e5a876bb10c01ee16f591a5f2bee93b4f2f90c 100644 (file)
--- a/drivers/scsi/mvsas.c
+++ b/drivers/scsi/mvsas.c
@@ -2822,7 +2822,9 @@ static void mvs_update_phyinfo(struct mvs_info *mvi, int i,
                dev_printk(KERN_DEBUG, &pdev->dev,
                        "phy[%d] Get Attached Address 0x%llX ,"
                        " SAS Address 0x%llX\n",
-                       i, phy->att_dev_sas_addr, phy->dev_sas_addr);
+                       i,
+                       (unsigned long long)phy->att_dev_sas_addr,
+                       (unsigned long long)phy->dev_sas_addr);
                dev_printk(KERN_DEBUG, &pdev->dev,
                        "Rate = %x , type = %d\n",
                        sas_phy->linkrate, phy->phy_type);
@@ -2957,7 +2959,7 @@ static int __devinit mvs_hw_init(struct mvs_info *mvi)
 
        /* enable auto port detection */
        mw32(GBL_PORT_TYPE, MODE_AUTO_DET_EN);
-       msleep(100);
+       msleep(1100);
        /* init and reset phys */
        for (i = 0; i < mvi->chip->n_phy; i++) {
                u32 lo = be32_to_cpu(*(u32 *)&mvi->sas_addr[4]);
@@ -3163,6 +3165,15 @@ static struct sas_domain_function_template mvs_transport_ops = {
 static struct pci_device_id __devinitdata mvs_pci_table[] = {
        { PCI_VDEVICE(MARVELL, 0x6320), chip_6320 },
        { PCI_VDEVICE(MARVELL, 0x6340), chip_6440 },
+       {
+               .vendor         = PCI_VENDOR_ID_MARVELL,
+               .device         = 0x6440,
+               .subvendor      = PCI_ANY_ID,
+               .subdevice      = 0x6480,
+               .class          = 0,
+               .class_mask     = 0,
+               .driver_data    = chip_6480,
+       },
        { PCI_VDEVICE(MARVELL, 0x6440), chip_6440 },
        { PCI_VDEVICE(MARVELL, 0x6480), chip_6480 },