Commit 472bca81 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] cciss update

From: <mikem@beardog.cca.cpqcorp.net>

This patch adds support for 2 new controllers.  The first is a PCI-Express
version of the 6400.  The second is actually a SATA controller using the cciss
interface.
parent 0d7b696f
...@@ -14,6 +14,8 @@ This driver is known to work with the following cards: ...@@ -14,6 +14,8 @@ This driver is known to work with the following cards:
* SA 6400 * SA 6400
* SA 6400 U320 Expansion Module * SA 6400 U320 Expansion Module
* SA 6i * SA 6i
* SA 6422
* SA V100
If nodes are not already created in the /dev/cciss directory If nodes are not already created in the /dev/cciss directory
......
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
#include <linux/completion.h> #include <linux/completion.h>
#define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin)) #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
#define DRIVER_NAME "Compaq CISS Driver (v 2.6.0)" #define DRIVER_NAME "Compaq CISS Driver (v 2.6.2)"
#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,6,0) #define DRIVER_VERSION CCISS_DRIVER_VERSION(2,6,2)
/* Embedded module documentation macros - see modules.h */ /* Embedded module documentation macros - see modules.h */
MODULE_AUTHOR("Hewlett-Packard Company"); MODULE_AUTHOR("Hewlett-Packard Company");
MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.0"); MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.2");
MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400" MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"
" SA6i"); " SA6i");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -79,6 +79,10 @@ const struct pci_device_id cciss_pci_device_id[] = { ...@@ -79,6 +79,10 @@ const struct pci_device_id cciss_pci_device_id[] = {
0x0E11, 0x409D, 0, 0, 0}, 0x0E11, 0x409D, 0, 0, 0},
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
0x0E11, 0x4091, 0, 0, 0}, 0x0E11, 0x4091, 0, 0, 0},
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
0x0E11, 0x409E, 0, 0, 0},
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
0x103C, 0x3211, 0, 0, 0},
{0,} {0,}
}; };
MODULE_DEVICE_TABLE(pci, cciss_pci_device_id); MODULE_DEVICE_TABLE(pci, cciss_pci_device_id);
...@@ -99,6 +103,8 @@ static struct board_type products[] = { ...@@ -99,6 +103,8 @@ static struct board_type products[] = {
{ 0x409C0E11, "Smart Array 6400", &SA5_access}, { 0x409C0E11, "Smart Array 6400", &SA5_access},
{ 0x409D0E11, "Smart Array 6400 EM", &SA5_access}, { 0x409D0E11, "Smart Array 6400 EM", &SA5_access},
{ 0x40910E11, "Smart Array 6i", &SA5_access}, { 0x40910E11, "Smart Array 6i", &SA5_access},
{ 0x409E0E11, "Smart Array 6422", &SA5_access},
{ 0x3211103C, "Smart Array V100", &SA5_access},
}; };
/* How long to wait (in millesconds) for board to go into simple mode */ /* How long to wait (in millesconds) for board to go into simple mode */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment