2 files changed, 25 insertions, 1 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 133106f6cb00..8d364f232877 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -98,7 +98,7 @@ static DEFINE_SPINLOCK(ipr_driver_lock);
 
 /* This table describes the differences between DMA controller chips */
 static const struct ipr_chip_cfg_t ipr_chip_cfg[] = {
-        { /* Gemstone and Citrine */
+        { /* Gemstone, Citrine, and Obsidian */
                 .mailbox = 0x0042C,
                 .cache_line_size = 0x20,
                 {
@@ -133,6 +133,8 @@ static const struct ipr_chip_cfg_t ipr_chip_cfg[] = {
 static const struct ipr_chip_t ipr_chip[] = {
         { PCI_VENDOR_ID_MYLEX, PCI_DEVICE_ID_IBM_GEMSTONE, &ipr_chip_cfg[0] },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE, &ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN, &ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN, &ipr_chip_cfg[0] },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SNIPE, &ipr_chip_cfg[1] },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP, &ipr_chip_cfg[1] }
 };
@@ -6554,12 +6556,30 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = {
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE,
                 PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571A,
               0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE,
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575B,
+                0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A,
+              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B,
+              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A,
+              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B,
+              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SNIPE,
                 PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_2780,
                 0, 0, (kernel_ulong_t)&ipr_chip_cfg[1] },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,
                 PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571E,
                 0, 0, (kernel_ulong_t)&ipr_chip_cfg[1] },
+        { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571F,
+                0, 0, (kernel_ulong_t)&ipr_chip_cfg[1] },
         { }
 };
 MODULE_DEVICE_TABLE(pci, ipr_pci_table);
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index c9cc40e5db24..cdd0f4bdb98c 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -61,6 +61,10 @@
 #define IPR_SUBS_DEV_ID_571A    0x02C0
 #define IPR_SUBS_DEV_ID_571B    0x02BE
 #define IPR_SUBS_DEV_ID_571E  0x02BF
+#define IPR_SUBS_DEV_ID_571F    0x02D5
+#define IPR_SUBS_DEV_ID_572A    0x02C1
+#define IPR_SUBS_DEV_ID_572B    0x02C2
+#define IPR_SUBS_DEV_ID_575B    0x030D
 
 #define IPR_NAME                                "ipr"