svn commit: r240199 - in stable/9/sys/dev: ahci ata ata/chipsets

[Alexander Motin]

Author: mav
Date: Fri Sep  7 14:04:00 2012
New Revision: 240199
URL: http://svn.freebsd.org/changeset/base/240199

Log:
  MFC r239907:
  Add IDs for JMicron JMB360/JMB362 AHCI SATA controllers.

Modified:
  stable/9/sys/dev/ahci/ahci.c
  stable/9/sys/dev/ata/ata-pci.h
  stable/9/sys/dev/ata/chipsets/ata-jmicron.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/ahci/ahci.c
==============================================================================
--- stable/9/sys/dev/ahci/ahci.c	Fri Sep  7 13:36:42 2012	(r240198)
+++ stable/9/sys/dev/ahci/ahci.c	Fri Sep  7 14:04:00 2012	(r240199)
@@ -181,7 +181,9 @@ static struct {
 	{0x1e0e8086, 0x00, "Intel Panther Point",	0},
 	{0x1e0f8086, 0x00, "Intel Panther Point",	0},
 	{0x23238086, 0x00, "Intel DH89xxCC",	0},
+	{0x2360197b, 0x00, "JMicron JMB360",	0},
 	{0x2361197b, 0x00, "JMicron JMB361",	AHCI_Q_NOFORCE},
+	{0x2362197b, 0x00, "JMicron JMB362",	0},
 	{0x2363197b, 0x00, "JMicron JMB363",	AHCI_Q_NOFORCE},
 	{0x2365197b, 0x00, "JMicron JMB365",	AHCI_Q_NOFORCE},
 	{0x2366197b, 0x00, "JMicron JMB366",	AHCI_Q_NOFORCE},

Modified: stable/9/sys/dev/ata/ata-pci.h
==============================================================================
--- stable/9/sys/dev/ata/ata-pci.h	Fri Sep  7 13:36:42 2012	(r240198)
+++ stable/9/sys/dev/ata/ata-pci.h	Fri Sep  7 14:04:00 2012	(r240199)
@@ -266,6 +266,7 @@ struct ata_pci_controller {
 #define ATA_JMICRON_ID          0x197b
 #define ATA_JMB360              0x2360197b
 #define ATA_JMB361              0x2361197b
+#define ATA_JMB362              0x2362197b
 #define ATA_JMB363              0x2363197b
 #define ATA_JMB365              0x2365197b
 #define ATA_JMB366              0x2366197b

Modified: stable/9/sys/dev/ata/chipsets/ata-jmicron.c
==============================================================================
--- stable/9/sys/dev/ata/chipsets/ata-jmicron.c	Fri Sep  7 13:36:42 2012	(r240198)
+++ stable/9/sys/dev/ata/chipsets/ata-jmicron.c	Fri Sep  7 14:04:00 2012	(r240199)
@@ -67,6 +67,7 @@ ata_jmicron_probe(device_t dev)
     static const struct ata_chip_id const ids[] =
     {{ ATA_JMB360, 0, 1, 0, ATA_SA300, "JMB360" },
      { ATA_JMB361, 0, 1, 1, ATA_UDMA6, "JMB361" },
+     { ATA_JMB362, 0, 2, 0, ATA_SA300, "JMB362" },
      { ATA_JMB363, 0, 2, 1, ATA_UDMA6, "JMB363" },
      { ATA_JMB365, 0, 1, 2, ATA_UDMA6, "JMB365" },
      { ATA_JMB366, 0, 2, 2, ATA_UDMA6, "JMB366" },