[PATCH] cciss: Add support for SA 6i embedded controller

From: mikem@beardog.cca.cpqcorp.net

This patch adds support for the next generation embedded cciss controller.
It also bumps the version and changes the author to HP.  This patch is in
2.4.

diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt
index d0e960252ae6b6b084a8fa10b094bd196af1d3f9..fef741327bc63ce18b12b12cab65a65eec8a3e68 100644 (file)
--- a/Documentation/cciss.txt
+++ b/Documentation/cciss.txt
@@ -13,6 +13,7 @@ This driver is known to work with the following cards:
        * SA 642
        * SA 6400
        * SA 6400 U320 Expansion Module
+       * SA 6i
 
 If nodes are not already created in the /dev/cciss directory
 

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 4f0367493c91a471d448565c17267e0f6db8cc6d..e26566a53bb0db087024d75b60cc6127cee84d7b 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -45,12 +45,14 @@
 #include <linux/completion.h>
 
 #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
-#define DRIVER_NAME "Compaq CISS Driver (v 2.5.0)"
-#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,5,0)
+#define DRIVER_NAME "Compaq CISS Driver (v 2.6.0)"
+#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,6,0)
 
 /* Embedded module documentation macros - see modules.h */
-MODULE_AUTHOR("Charles M. White III - Compaq Computer Corporation");
-MODULE_DESCRIPTION("Driver for Compaq Smart Array Controller 5xxx v. 2.5.0");
+MODULE_AUTHOR("Hewlett-Packard Company");
+MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.0");
+MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"
+                       " SA6i");
 MODULE_LICENSE("GPL");
 
 #include "cciss_cmd.h"
@@ -75,6 +77,8 @@ const struct pci_device_id cciss_pci_device_id[] = {
                0x0E11, 0x409C, 0, 0, 0},
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
                0x0E11, 0x409D, 0, 0, 0},
+       { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
+               0x0E11, 0x4091, 0, 0, 0},
        {0,}
 };
 MODULE_DEVICE_TABLE(pci, cciss_pci_device_id);
@@ -94,6 +98,7 @@ static struct board_type products[] = {
        { 0x409B0E11, "Smart Array 642", &SA5_access},
        { 0x409C0E11, "Smart Array 6400", &SA5_access},
        { 0x409D0E11, "Smart Array 6400 EM", &SA5_access},
+       { 0x40910E11, "Smart Array 6i", &SA5_access},
 };
 
 /* How long to wait (in millesconds) for board to go into simple mode */