Author: mav
Date: Sat Nov 16 10:41:49 2013
New Revision: 258215
URL: http://svnweb.freebsd.org/changeset/base/258215
Log:
MFC r253475 (by jfv):
Add new Coleto Creek device support: SATA, SMBus, and Watchdog devices.
Modified:
stable/9/sys/dev/ahci/ahci.c
stable/9/sys/dev/ata/ata-pci.h
stable/9/sys/dev/ata/chipsets/ata-intel.c
stable/9/sys/dev/ichsmb/ichsmb_pci.c
stable/9/sys/dev/ichwd/ichwd.c
stable/9/sys/dev/ichwd/ichwd.h
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 Sat Nov 16 10:40:43 2013
(r258214)
+++ stable/9/sys/dev/ahci/ahci.c Sat Nov 16 10:41:49 2013
(r258215)
@@ -202,6 +202,7 @@ static struct {
{0x1e078086, 0x00, "Intel Panther Point", 0},
{0x1e0e8086, 0x00, "Intel Panther Point", 0},
{0x1e0f8086, 0x00, "Intel Panther Point", 0},
+ {0x23a38086, 0x00, "Intel Coleto Creek", 0},
{0x8c028086, 0x00, "Intel Lynx Point", 0},
{0x8c038086, 0x00, "Intel Lynx Point", 0},
{0x8c048086, 0x00, "Intel Lynx Point", 0},
Modified: stable/9/sys/dev/ata/ata-pci.h
==============================================================================
--- stable/9/sys/dev/ata/ata-pci.h Sat Nov 16 10:40:43 2013
(r258214)
+++ stable/9/sys/dev/ata/ata-pci.h Sat Nov 16 10:41:49 2013
(r258215)
@@ -277,6 +277,10 @@ struct ata_pci_controller {
#define ATA_ISCH 0x811a8086
#define ATA_DH89XXCC 0x23238086
+#define ATA_COLETOCRK_AH1 0x23a38086
+#define ATA_COLETOCRK_S1 0x23a18086
+#define ATA_COLETOCRK_S2 0x23a68086
+
#define ATA_ITE_ID 0x1283
#define ATA_IT8211F 0x82111283
#define ATA_IT8212F 0x82121283
Modified: stable/9/sys/dev/ata/chipsets/ata-intel.c
==============================================================================
--- stable/9/sys/dev/ata/chipsets/ata-intel.c Sat Nov 16 10:40:43 2013
(r258214)
+++ stable/9/sys/dev/ata/chipsets/ata-intel.c Sat Nov 16 10:41:49 2013
(r258215)
@@ -227,6 +227,9 @@ ata_intel_probe(device_t dev)
{ ATA_I31244, 0, 0, 2, ATA_SA150, "31244" },
{ ATA_ISCH, 0, 0, 1, ATA_UDMA5, "SCH" },
{ ATA_DH89XXCC, 0, INTEL_AHCI, 0, ATA_SA300, "DH89xxCC" },
+ { ATA_COLETOCRK_S1, 0, INTEL_6CH2, 0, ATA_SA300, "COLETOCRK" },
+ { ATA_COLETOCRK_S2, 0, INTEL_6CH2, 0, ATA_SA300, "COLETOCRK" },
+ { ATA_COLETOCRK_AH1,0, INTEL_AHCI, 0, ATA_SA300, "COLETOCRK" },
{ 0, 0, 0, 0, 0, 0}};
if (pci_get_vendor(dev) != ATA_INTEL_ID)
Modified: stable/9/sys/dev/ichsmb/ichsmb_pci.c
==============================================================================
--- stable/9/sys/dev/ichsmb/ichsmb_pci.c Sat Nov 16 10:40:43 2013
(r258214)
+++ stable/9/sys/dev/ichsmb/ichsmb_pci.c Sat Nov 16 10:41:49 2013
(r258215)
@@ -85,6 +85,7 @@ __FBSDID("$FreeBSD$");
#define ID_PATSBURG 0x1d228086
#define ID_CPT 0x1c228086
#define ID_PPT 0x1e228086
+#define ID_COLETOCRK 0x23B08086
#define ID_LPT 0x8c228086
#define PCIS_SERIALBUS_SMBUS_PROGIF 0x00
@@ -192,6 +193,9 @@ ichsmb_pci_probe(device_t dev)
case ID_LPT:
device_set_desc(dev, "Intel Lynx Point SMBus controller");
break;
+ case ID_COLETOCRK:
+ device_set_desc(dev, "Intel Coleto Creek SMBus controller");
+ break;
default:
return (ENXIO);
}
Modified: stable/9/sys/dev/ichwd/ichwd.c
==============================================================================
--- stable/9/sys/dev/ichwd/ichwd.c Sat Nov 16 10:40:43 2013
(r258214)
+++ stable/9/sys/dev/ichwd/ichwd.c Sat Nov 16 10:41:49 2013
(r258215)
@@ -192,6 +192,7 @@ static struct ichwd_device ichwd_devices
{ DEVICEID_PPT30, "Intel Panther Point watchdog timer", 10 },
{ DEVICEID_PPT31, "Intel Panther Point watchdog timer", 10 },
{ DEVICEID_DH89XXCC_LPC, "Intel DH89xxCC watchdog timer", 10 },
+ { DEVICEID_COLETOCRK_LPC, "Intel Coleto Creek watchdog timer", 10 },
{ 0, NULL, 0 },
};
Modified: stable/9/sys/dev/ichwd/ichwd.h
==============================================================================
--- stable/9/sys/dev/ichwd/ichwd.h Sat Nov 16 10:40:43 2013
(r258214)
+++ stable/9/sys/dev/ichwd/ichwd.h Sat Nov 16 10:41:49 2013
(r258215)
@@ -126,6 +126,7 @@ struct ichwd_softc {
#define DEVICEID_PPT30 0x1e5e
#define DEVICEID_PPT31 0x1e5f
#define DEVICEID_DH89XXCC_LPC 0x2310
+#define DEVICEID_COLETOCRK_LPC 0x2390
#define DEVICEID_82801AA 0x2410
#define DEVICEID_82801AB 0x2420
#define DEVICEID_82801BA 0x2440
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
