[SCSI] stex: update device id info

- add comments for various devices
- remove unused device ids(0xf350, 0x4301, 0x8301, 0x8302)
- add new device id(0xe350)
- fix vendor id of st_vsc
- modify Kconfig help info

Signed-off-by: Ed Lin <ed.lin@promise.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

2 files changed, 33 insertions, 11 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 1b4bfaabcfbc..69569096dae5 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -982,8 +982,13 @@ config SCSI_STEX
         tristate "Promise SuperTrak EX Series support"
         depends on PCI && SCSI
         ---help---
-          This driver supports Promise SuperTrak EX8350/8300/16350/16300
-          Storage controllers.
+          This driver supports Promise SuperTrak EX series storage controllers.
+
+          Promise provides Linux RAID configuration utility for these
+          controllers. Please visit <http://www.promise.com> to download.
+
+          To compile this driver as a module, choose M here: the
+          module will be called stex.
 
 config SCSI_SYM53C8XX_2
         tristate "SYM53C8XX Version 2 SCSI support"
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index a20cbd9d325a..0fd115c04e59 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -1356,15 +1356,32 @@ static void stex_shutdown(struct pci_dev *pdev)
 }
 
 static struct pci_device_id stex_pci_tbl[] = {
-        { 0x105a, 0x8350, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
-        { 0x105a, 0xc350, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
-        { 0x105a, 0xf350, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
-        { 0x105a, 0x4301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
-        { 0x105a, 0x4302, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
-        { 0x105a, 0x8301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
-        { 0x105a, 0x8302, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_shasta },
-        { 0x1725, 0x7250, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_vsc },
-        { 0x105a, 0x8650, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_yosemite },
+        /* st_shasta */
+        { 0x105a, 0x8350, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                st_shasta }, /* SuperTrak EX8350/8300/16350/16300 */
+        { 0x105a, 0xc350, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                st_shasta }, /* SuperTrak EX12350 */
+        { 0x105a, 0x4302, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                st_shasta }, /* SuperTrak EX4350 */
+        { 0x105a, 0xe350, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                st_shasta }, /* SuperTrak EX24350 */
+
+        /* st_vsc */
+        { 0x105a, 0x7250, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_vsc },
+
+        /* st_yosemite */
+        { 0x105a, 0x8650, PCI_ANY_ID, 0x4600, 0, 0,
+                st_yosemite }, /* SuperTrak EX4650 */
+        { 0x105a, 0x8650, PCI_ANY_ID, 0x4610, 0, 0,
+                st_yosemite }, /* SuperTrak EX4650o */
+        { 0x105a, 0x8650, PCI_ANY_ID, 0x8600, 0, 0,
+                st_yosemite }, /* SuperTrak EX8650EL */
+        { 0x105a, 0x8650, PCI_ANY_ID, 0x8601, 0, 0,
+                st_yosemite }, /* SuperTrak EX8650 */
+        { 0x105a, 0x8650, PCI_ANY_ID, 0x8602, 0, 0,
+                st_yosemite }, /* SuperTrak EX8654 */
+        { 0x105a, 0x8650, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                st_yosemite }, /* generic st_yosemite */
         { }     /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, stex_pci_tbl);