Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8e9d58e723e29e8b04c09bd9badd81c1d8232f5f
Commit:     8e9d58e723e29e8b04c09bd9badd81c1d8232f5f
Parent:     9b80cb4be1f4181875e0cf274dc59f42964fdf1b
Author:     Salyzyn, Mark <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 18 15:01:41 2006 -0500
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Sat Jan 6 09:02:37 2007 -0600

    [SCSI] aacraid: Product List Update
    
    Update drivers/scsi/aacraid/linit.c and Documentation/scsi/aacraid.txt
    file with the current list of
    adapters supported by the aacraid driver. Deprecated a few adapters that
    never shipped, corrected a
    few and added new adapters that matched the family code support. No
    functional changes to the driver.
    No side effects.
    
    Signed-off-by: Mark Salyzyn <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
---
 Documentation/scsi/aacraid.txt |   66 +++++++++++++++++++++++-----------------
 drivers/scsi/aacraid/linit.c   |   20 ++++++------
 2 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/Documentation/scsi/aacraid.txt b/Documentation/scsi/aacraid.txt
index 3367130..dc8e44f 100644
--- a/Documentation/scsi/aacraid.txt
+++ b/Documentation/scsi/aacraid.txt
@@ -11,43 +11,42 @@ the original).
 Supported Cards/Chipsets
 -------------------------
        PCI ID (pci.ids)        OEM     Product
-       9005:0283:9005:0283     Adaptec Catapult (3210S with arc firmware)
-       9005:0284:9005:0284     Adaptec Tomcat (3410S with arc firmware)
        9005:0285:9005:0285     Adaptec 2200S (Vulcan)
        9005:0285:9005:0286     Adaptec 2120S (Crusader)
        9005:0285:9005:0287     Adaptec 2200S (Vulcan-2m)
        9005:0285:9005:0288     Adaptec 3230S (Harrier)
        9005:0285:9005:0289     Adaptec 3240S (Tornado)
        9005:0285:9005:028a     Adaptec 2020ZCR (Skyhawk)
-       9005:0285:9005:028b     Adaptec 2025ZCR (Terminator)
+       9005:0285:9005:028b     Adaptec 2025ZCR (Terminator)
        9005:0286:9005:028c     Adaptec 2230S (Lancer)
        9005:0286:9005:028c     Adaptec 2230SLP (Lancer)
        9005:0286:9005:028d     Adaptec 2130S (Lancer)
        9005:0285:9005:028e     Adaptec 2020SA (Skyhawk)
-       9005:0285:9005:028f     Adaptec 2025SA (Terminator)
+       9005:0285:9005:028f     Adaptec 2025SA (Terminator)
        9005:0285:9005:0290     Adaptec 2410SA (Jaguar)
-       9005:0285:103c:3227     Adaptec 2610SA (Bearcat HP release)
-       9005:0285:9005:0293     Adaptec 21610SA (Corsair-16)
+       9005:0285:103c:3227     Adaptec 2610SA (Bearcat HP release)
+       9005:0285:9005:0293     Adaptec 21610SA (Corsair-16)
        9005:0285:9005:0296     Adaptec 2240S (SabreExpress)
        9005:0285:9005:0292     Adaptec 2810SA (Corsair-8)
-       9005:0285:9005:0294     Adaptec Prowler
-       9005:0285:9005:0297     Adaptec 4005SAS (AvonPark)
-       9005:0285:9005:0298     Adaptec 4000SAS (BlackBird)
+       9005:0285:9005:0297     Adaptec 4005 (AvonPark)
+       9005:0285:9005:0298     Adaptec 4000 (BlackBird)
        9005:0285:9005:0299     Adaptec 4800SAS (Marauder-X)
        9005:0285:9005:029a     Adaptec 4805SAS (Marauder-E)
        9005:0286:9005:029b     Adaptec 2820SA (Intruder)
        9005:0286:9005:029c     Adaptec 2620SA (Intruder)
        9005:0286:9005:029d     Adaptec 2420SA (Intruder HP release)
-       9005:0286:9005:02a2     Adaptec 3800SAS (Hurricane44)
-       9005:0286:9005:02a7     Adaptec 3805SAS (Hurricane80)
-       9005:0286:9005:02a8     Adaptec 3400SAS (Hurricane40)
-       9005:0286:9005:02ac     Adaptec 1800SAS (Typhoon44)
-       9005:0286:9005:02b3     Adaptec 2400SAS (Hurricane40lm)
-       9005:0285:9005:02b5     Adaptec ASR5800 (Voodoo44)
-       9005:0285:9005:02b6     Adaptec ASR5805 (Voodoo80)
-       9005:0285:9005:02b7     Adaptec ASR5808 (Voodoo08)
+       9005:0286:9005:02ac     Adaptec 1800 (Typhoon44)
+       9005:0285:9005:02b5     Adaptec 5445 (Voodoo44)
+       9005:0285:9005:02b6     Adaptec 5805 (Voodoo80)
+       9005:0285:9005:02b7     Adaptec 5085 (Voodoo08)
+       9005:0285:9005:02bb     Adaptec 3405 (Marauder40LP)
+       9005:0285:9005:02bc     Adaptec 3805 (Marauder80LP)
+       9005:0285:9005:02c7     Adaptec 3085 (Marauder08ELP)
+       9005:0285:9005:02bd     Adaptec 31205 (Marauder120)
+       9005:0285:9005:02be     Adaptec 31605 (Marauder160)
+       9005:0285:9005:02c3     Adaptec 51205 (Voodoo120)
+       9005:0285:9005:02c4     Adaptec 51605 (Voodoo160)
        1011:0046:9005:0364     Adaptec 5400S (Mustang)
-       1011:0046:9005:0365     Adaptec 5400S (Mustang)
        9005:0287:9005:0800     Adaptec Themisto (Jupiter)
        9005:0200:9005:0200     Adaptec Themisto (Jupiter)
        9005:0286:9005:0800     Adaptec Callisto (Jupiter)
@@ -68,21 +67,32 @@ Supported Cards/Chipsets
        9005:0285:17aa:0287     Legend  S230 (Vulcan)
        9005:0285:9005:0290     IBM     ServeRAID 7t (Jaguar)
        9005:0285:1014:02F2     IBM     ServeRAID 8i (AvonPark)
-       9005:0285:1014:0312     IBM     ServeRAID 8i (AvonParkLite)
        9005:0286:1014:9540     IBM     ServeRAID 8k/8k-l4 (AuroraLite)
        9005:0286:1014:9580     IBM     ServeRAID 8k/8k-l8 (Aurora)
-       9005:0286:1014:034d     IBM     ServeRAID 8s (Hurricane)
-       9005:0286:9005:029e     ICP     ICP9024R0 (Lancer)
-       9005:0286:9005:029f     ICP     ICP9014R0 (Lancer)
+       9005:0285:1014:034d     IBM     ServeRAID 8s (Marauder-E)
+       9005:0286:9005:029e     ICP     ICP9024RO (Lancer)
+       9005:0286:9005:029f     ICP     ICP9014RO (Lancer)
        9005:0286:9005:02a0     ICP     ICP9047MA (Lancer)
        9005:0286:9005:02a1     ICP     ICP9087MA (Lancer)
-       9005:0286:9005:02a3     ICP     ICP5445AU (Hurricane44)
-       9005:0286:9005:02a4     ICP     ICP9085LI (Marauder-X)
-       9005:0286:9005:02a5     ICP     ICP5085BR (Marauder-E)
+       9005:0285:9005:02a4     ICP     ICP9085LI (Marauder-X)
+       9005:0285:9005:02a5     ICP     ICP5085BR (Marauder-E)
        9005:0286:9005:02a6     ICP     ICP9067MA (Intruder-6)
-       9005:0286:9005:02a9     ICP     ICP5085AU (Hurricane80)
-       9005:0286:9005:02aa     ICP     ICP5045AU (Hurricane40)
-       9005:0286:9005:02b4     ICP     ICP5045AL (Hurricane40lm)
+       9005:0285:9005:02b2     ICP     (Voodoo 8 internal 8 external)
+       9005:0285:9005:02b8     ICP     ICP5445SL (Voodoo44)
+       9005:0285:9005:02b9     ICP     ICP5085SL (Voodoo80)
+       9005:0285:9005:02ba     ICP     ICP5805SL (Voodoo08)
+       9005:0285:9005:02bf     ICP     ICP5045BL (Marauder40LP)
+       9005:0285:9005:02c0     ICP     ICP5085BL (Marauder80LP)
+       9005:0285:9005:02c8     ICP     ICP5805BL (Marauder08ELP)
+       9005:0285:9005:02c1     ICP     ICP5125BR (Marauder120)
+       9005:0285:9005:02c2     ICP     ICP5165BR (Marauder160)
+       9005:0285:9005:02c5     ICP     ICP5125SL (Voodoo120)
+       9005:0285:9005:02c6     ICP     ICP5165SL (Voodoo160)
+       9005:0286:9005:02ab             (Typhoon40)
+       9005:0286:9005:02ad             (Aurora ARK)
+       9005:0286:9005:02ae             (Aurora Lite ARK)
+       9005:0285:9005:02b0             (Sunrise Lake ARK)
+       9005:0285:9005:02b1     Adaptec (Voodoo 8 internal 8 external)
 
 People
 -------------------------
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 359e7dd..d2cf875 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -117,8 +117,8 @@ static struct pci_device_id aac_pci_tbl[] = {
        { 0x9005, 0x0286, 0x9005, 0x029b, 0, 0, 22 }, /* AAR-2820SA (Intruder) 
*/
        { 0x9005, 0x0286, 0x9005, 0x029c, 0, 0, 23 }, /* AAR-2620SA (Intruder) 
*/
        { 0x9005, 0x0286, 0x9005, 0x029d, 0, 0, 24 }, /* AAR-2420SA (Intruder) 
*/
-       { 0x9005, 0x0286, 0x9005, 0x029e, 0, 0, 25 }, /* ICP9024R0 (Lancer) */
-       { 0x9005, 0x0286, 0x9005, 0x029f, 0, 0, 26 }, /* ICP9014R0 (Lancer) */
+       { 0x9005, 0x0286, 0x9005, 0x029e, 0, 0, 25 }, /* ICP9024RO (Lancer) */
+       { 0x9005, 0x0286, 0x9005, 0x029f, 0, 0, 26 }, /* ICP9014RO (Lancer) */
        { 0x9005, 0x0286, 0x9005, 0x02a0, 0, 0, 27 }, /* ICP9047MA (Lancer) */
        { 0x9005, 0x0286, 0x9005, 0x02a1, 0, 0, 28 }, /* ICP9087MA (Lancer) */
        { 0x9005, 0x0286, 0x9005, 0x02a3, 0, 0, 29 }, /* ICP5445AU 
(Hurricane44) */
@@ -137,15 +137,15 @@ static struct pci_device_id aac_pci_tbl[] = {
        { 0x9005, 0x0285, 0x9005, 0x0294, 0, 0, 41 }, /* ESD SO-DIMM PCI-X SATA 
ZCR (Prowler) */
        { 0x9005, 0x0285, 0x103C, 0x3227, 0, 0, 42 }, /* AAR-2610SA PCI SATA 
6ch */
        { 0x9005, 0x0285, 0x9005, 0x0296, 0, 0, 43 }, /* ASR-2240S 
(SabreExpress) */
-       { 0x9005, 0x0285, 0x9005, 0x0297, 0, 0, 44 }, /* ASR-4005SAS */
+       { 0x9005, 0x0285, 0x9005, 0x0297, 0, 0, 44 }, /* ASR-4005 */
        { 0x9005, 0x0285, 0x1014, 0x02F2, 0, 0, 45 }, /* IBM 8i (AvonPark) */
        { 0x9005, 0x0285, 0x1014, 0x0312, 0, 0, 45 }, /* IBM 8i (AvonPark Lite) 
*/
        { 0x9005, 0x0286, 0x1014, 0x9580, 0, 0, 46 }, /* IBM 8k/8k-l8 (Aurora) 
*/
        { 0x9005, 0x0286, 0x1014, 0x9540, 0, 0, 47 }, /* IBM 8k/8k-l4 (Aurora 
Lite) */
-       { 0x9005, 0x0285, 0x9005, 0x0298, 0, 0, 48 }, /* ASR-4000SAS 
(BlackBird) */
+       { 0x9005, 0x0285, 0x9005, 0x0298, 0, 0, 48 }, /* ASR-4000 (BlackBird) */
        { 0x9005, 0x0285, 0x9005, 0x0299, 0, 0, 49 }, /* ASR-4800SAS 
(Marauder-X) */
        { 0x9005, 0x0285, 0x9005, 0x029a, 0, 0, 50 }, /* ASR-4805SAS 
(Marauder-E) */
-       { 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 51 }, /* ASR-3800SAS 
(Hurricane44) */
+       { 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 51 }, /* ASR-3800 (Hurricane44) 
*/
 
        { 0x9005, 0x0285, 0x1028, 0x0287, 0, 0, 52 }, /* Perc 320/DC*/
        { 0x1011, 0x0046, 0x9005, 0x0365, 0, 0, 53 }, /* Adaptec 5400S 
(Mustang)*/
@@ -193,8 +193,8 @@ static struct aac_driver_ident aac_drivers[] = {
        { aac_rkt_init, "aacraid",  "ADAPTEC ", "AAR-2820SA      ", 1 }, /* 
AAR-2820SA (Intruder) */
        { aac_rkt_init, "aacraid",  "ADAPTEC ", "AAR-2620SA      ", 1 }, /* 
AAR-2620SA (Intruder) */
        { aac_rkt_init, "aacraid",  "ADAPTEC ", "AAR-2420SA      ", 1 }, /* 
AAR-2420SA (Intruder) */
-       { aac_rkt_init, "aacraid",  "ICP     ", "ICP9024R0       ", 2 }, /* 
ICP9024R0 (Lancer) */
-       { aac_rkt_init, "aacraid",  "ICP     ", "ICP9014R0       ", 1 }, /* 
ICP9014R0 (Lancer) */
+       { aac_rkt_init, "aacraid",  "ICP     ", "ICP9024RO       ", 2 }, /* 
ICP9024RO (Lancer) */
+       { aac_rkt_init, "aacraid",  "ICP     ", "ICP9014RO       ", 1 }, /* 
ICP9014RO (Lancer) */
        { aac_rkt_init, "aacraid",  "ICP     ", "ICP9047MA       ", 1 }, /* 
ICP9047MA (Lancer) */
        { aac_rkt_init, "aacraid",  "ICP     ", "ICP9087MA       ", 1 }, /* 
ICP9087MA (Lancer) */
        { aac_rkt_init, "aacraid",  "ICP     ", "ICP5445AU       ", 1 }, /* 
ICP5445AU (Hurricane44) */
@@ -212,14 +212,14 @@ static struct aac_driver_ident aac_drivers[] = {
        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-2026ZCR     ", 1 }, /* ESD 
SO-DIMM PCI-X SATA ZCR (Prowler) */
        { aac_rx_init, "aacraid",  "ADAPTEC ", "AAR-2610SA      ", 1 }, /* SATA 
6Ch (Bearcat) */
        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-2240S       ", 1 }, /* 
ASR-2240S (SabreExpress) */
-       { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4005SAS     ", 1 }, /* 
ASR-4005SAS */
+       { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4005        ", 1 }, /* 
ASR-4005 */
        { aac_rx_init, "ServeRAID","IBM     ", "ServeRAID 8i    ", 1 }, /* IBM 
8i (AvonPark) */
        { aac_rkt_init, "ServeRAID","IBM     ", "ServeRAID 8k-l8 ", 1 }, /* IBM 
8k/8k-l8 (Aurora) */
        { aac_rkt_init, "ServeRAID","IBM     ", "ServeRAID 8k-l4 ", 1 }, /* IBM 
8k/8k-l4 (Aurora Lite) */
-       { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4000SAS     ", 1 }, /* 
ASR-4000SAS (BlackBird & AvonPark) */
+       { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4000        ", 1 }, /* 
ASR-4000 (BlackBird & AvonPark) */
        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4800SAS     ", 1 }, /* 
ASR-4800SAS (Marauder-X) */
        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4805SAS     ", 1 }, /* 
ASR-4805SAS (Marauder-E) */
-       { aac_rkt_init, "aacraid",  "ADAPTEC ", "ASR-3800SAS     ", 1 }, /* 
ASR-3800SAS (Hurricane44) */
+       { aac_rkt_init, "aacraid",  "ADAPTEC ", "ASR-3800        ", 1 }, /* 
ASR-3800 (Hurricane44) */
 
        { aac_rx_init, "percraid", "DELL    ", "PERC 320/DC     ", 2, 
AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Perc 320/DC*/
        { aac_sa_init, "aacraid",  "ADAPTEC ", "Adaptec 5400S   ", 4, 
AAC_QUIRK_34SG }, /* Adaptec 5400S (Mustang)*/
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to