From 428e286da31ec38f26cac2c57f6b772fb4a010c1 Mon Sep 17 00:00:00 2001
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Fri, 19 Jul 2013 21:37:40 +0000
Subject: [PATCH] Add new Coleto Creek device support: SATA, SMBus, and
 Watchdog devices.

MFC after: 1 week
---
 sys/dev/ahci/ahci.c              | 1 +
 sys/dev/ata/ata-pci.h            | 4 ++++
 sys/dev/ata/chipsets/ata-intel.c | 3 +++
 sys/dev/ichsmb/ichsmb_pci.c      | 4 ++++
 sys/dev/ichwd/ichwd.c            | 1 +
 sys/dev/ichwd/ichwd.h            | 1 +
 6 files changed, 14 insertions(+)

diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c
index 78f59b77fc7b..9cc3b444d222 100644
--- a/sys/dev/ahci/ahci.c
+++ b/sys/dev/ahci/ahci.c
@@ -196,6 +196,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},
diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h
index d1eb0e936f39..8b360731b7fd 100644
--- a/sys/dev/ata/ata-pci.h
+++ b/sys/dev/ata/ata-pci.h
@@ -274,6 +274,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
diff --git a/sys/dev/ata/chipsets/ata-intel.c b/sys/dev/ata/chipsets/ata-intel.c
index 6a11a2372701..d7b135d545c1 100644
--- a/sys/dev/ata/chipsets/ata-intel.c
+++ b/sys/dev/ata/chipsets/ata-intel.c
@@ -226,6 +226,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)
diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c
index 083338fea5f0..049a98b621a0 100644
--- a/sys/dev/ichsmb/ichsmb_pci.c
+++ b/sys/dev/ichsmb/ichsmb_pci.c
@@ -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);
 	}
diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c
index 245cfbf5e9b6..f28f5e04f6b3 100644
--- a/sys/dev/ichwd/ichwd.c
+++ b/sys/dev/ichwd/ichwd.c
@@ -195,6 +195,7 @@ static struct ichwd_device ichwd_devices[] = {
 	{ DEVICEID_LPT1,     "Intel Lynx Point watchdog timer",		10 },
 	{ DEVICEID_LPT2,     "Intel Lynx Point watchdog timer",		10 },
 	{ DEVICEID_DH89XXCC_LPC,  "Intel DH89xxCC watchdog timer",	10 },
+	{ DEVICEID_COLETOCRK_LPC, "Intel Coleto Creek watchdog timer",  10 },
 	{ 0, NULL, 0 },
 };
 
diff --git a/sys/dev/ichwd/ichwd.h b/sys/dev/ichwd/ichwd.h
index 858e3bc24edf..6f0c7173efd7 100644
--- a/sys/dev/ichwd/ichwd.h
+++ b/sys/dev/ichwd/ichwd.h
@@ -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