Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8a4a0f3ad071e258a9637c5491c34005a9a97903

Authored by Eddie Wai
Committed by James Bottomley
1 parent a977d2c9dc
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SCSI] bnx2i: Added support for the 57712(E) devices 

Moved all PCI_DEVICE_ID_NX2_57712(E) definitions to pci_ids.h

Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
Acked-by: Michael Chan <mchan@broadcom.com>
Acked-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

Showing 3 changed files with 8 additions and 11 deletions Side-by-side Diff

drivers/net/bnx2x/bnx2x_main.c
Diff comments   View file @ 8a4a0f3
... ... @@ -145,13 +145,6 @@
145 145 { "Broadcom NetXtreme II BCM57712E XGb" }
146 146 };
147 147  
148   -#ifndef PCI_DEVICE_ID_NX2_57712
149   -#define PCI_DEVICE_ID_NX2_57712 0x1662
150   -#endif
151   -#ifndef PCI_DEVICE_ID_NX2_57712E
152   -#define PCI_DEVICE_ID_NX2_57712E 0x1663
153   -#endif
154   -
155 148 static DEFINE_PCI_DEVICE_TABLE(bnx2x_pci_tbl) = {
156 149 { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57710), BCM57710 },
157 150 { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711), BCM57711 },
drivers/scsi/bnx2i/bnx2i_init.c
Diff comments   View file @ 8a4a0f3
... ... @@ -29,7 +29,7 @@
29 29 MODULE_AUTHOR("Anil Veerabhadrappa <anilgv@broadcom.com> and "
30 30 "Eddie Wai <eddie.wai@broadcom.com>");
31 31  
32   -MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/57710/57711"
  32 +MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/57710/57711/57712"
33 33 " iSCSI Driver");
34 34 MODULE_LICENSE("GPL");
35 35 MODULE_VERSION(DRV_MODULE_VERSION);
... ... @@ -88,9 +88,11 @@
88 88 (hba->pci_did == PCI_DEVICE_ID_NX2_5709S)) {
89 89 set_bit(BNX2I_NX2_DEV_5709, &hba->cnic_dev_type);
90 90 hba->mail_queue_access = BNX2I_MQ_BIN_MODE;
91   - } else if (hba->pci_did == PCI_DEVICE_ID_NX2_57710 ||
92   - hba->pci_did == PCI_DEVICE_ID_NX2_57711 ||
93   - hba->pci_did == PCI_DEVICE_ID_NX2_57711E)
  91 + } else if (hba->pci_did == PCI_DEVICE_ID_NX2_57710 ||
  92 + hba->pci_did == PCI_DEVICE_ID_NX2_57711 ||
  93 + hba->pci_did == PCI_DEVICE_ID_NX2_57711E ||
  94 + hba->pci_did == PCI_DEVICE_ID_NX2_57712 ||
  95 + hba->pci_did == PCI_DEVICE_ID_NX2_57712E)
94 96 set_bit(BNX2I_NX2_DEV_57710, &hba->cnic_dev_type);
95 97 else
96 98 printk(KERN_ALERT "bnx2i: unknown device, 0x%x\n",
include/linux/pci_ids.h
Diff comments   View file @ 8a4a0f3
... ... @@ -2078,6 +2078,8 @@
2078 2078 #define PCI_DEVICE_ID_TIGON3_5723 0x165b
2079 2079 #define PCI_DEVICE_ID_TIGON3_5705M 0x165d
2080 2080 #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e
  2081 +#define PCI_DEVICE_ID_NX2_57712 0x1662
  2082 +#define PCI_DEVICE_ID_NX2_57712E 0x1663
2081 2083 #define PCI_DEVICE_ID_TIGON3_5714 0x1668
2082 2084 #define PCI_DEVICE_ID_TIGON3_5714S 0x1669
2083 2085 #define PCI_DEVICE_ID_TIGON3_5780 0x166a