From f4302b1e5986851c4287a9c72ce47d4c25fbc7b0 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Fri, 24 Mar 2006 09:47:29 +0000
Subject: [PATCH] Backport from Linux 2.6: Add Broadcom HT-1000 south bridge's
 PCI ID to i2c-piix driver.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@3276 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 README                    |  2 +-
 doc/busses/i2c-piix4      |  2 +-
 kernel/busses/i2c-piix4.c | 11 ++++++++++-
 mkpatch/mkpatch.pl        |  7 +++----
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/README b/README
index a7827fcc..39fc868a 100644
--- a/README
+++ b/README
@@ -63,7 +63,7 @@ At least the following I2C/SMBus adapters are supported:
   Intel I810/I810E/I815/I845G GMCH
   Intel 82443MX (440MX)
   NVidia nForce, nForce2, nForce3, nForce4
-  ServerWorks OSB4, CSB5, CSB6
+  ServerWorks OSB4, CSB5, CSB6, HT-1000
   SiS 5595, 630, 645, 655, 730
   SMSC Victory66
   3Dfx Voodoo 3 and Banshee
diff --git a/doc/busses/i2c-piix4 b/doc/busses/i2c-piix4
index 2643798d..5e97a88e 100644
--- a/doc/busses/i2c-piix4
+++ b/doc/busses/i2c-piix4
@@ -7,7 +7,7 @@ Supported adapters:
   * Intel 82371AB PIIX4 and PIIX4E
   * Intel 82443MX (440MX)
     Datasheet: Publicly available at the Intel website
-  * ServerWorks OSB4, CSB5  and CSB6 southbridges
+  * ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges
     Datasheet: Only available via NDA from ServerWorks
   * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge
     Datasheet: Publicly available at the SMSC website http://www.smsc.com
diff --git a/kernel/busses/i2c-piix4.c b/kernel/busses/i2c-piix4.c
index fa179c5b..3e6e4ad4 100644
--- a/kernel/busses/i2c-piix4.c
+++ b/kernel/busses/i2c-piix4.c
@@ -22,7 +22,7 @@
 /*
    Supports:
 	Intel PIIX4, 440MX
-	Serverworks OSB4, CSB5, CSB6
+	Serverworks OSB4, CSB5, CSB6, HT-1000
 	SMSC Victory66
 
    Note: we assume there can only be one device, with one SMBus interface.
@@ -459,6 +459,8 @@ static struct i2c_adapter piix4_adapter = {
 #define PCI_DEVICE_ID_SERVERWORKS_CSB6 0x0203
 #endif
 
+#define PCI_DEVICE_ID_SERVERWORKS_HT1000SB 0x0205
+
 static struct pci_device_id piix4_ids[] __devinitdata = {
 	{
 		.vendor =	PCI_VENDOR_ID_INTEL,
@@ -488,6 +490,13 @@ static struct pci_device_id piix4_ids[] __devinitdata = {
 		.subdevice =	PCI_ANY_ID,
 		.driver_data =	0,
 	},
+	{
+		.vendor =	PCI_VENDOR_ID_SERVERWORKS,
+		.device =	PCI_DEVICE_ID_SERVERWORKS_HT1000SB,
+		.subvendor =	PCI_ANY_ID,
+		.subdevice =	PCI_ANY_ID,
+		.driver_data =	0,
+	},
 	{
 		.vendor =	PCI_VENDOR_ID_INTEL,
 		.device =	PCI_DEVICE_ID_INTEL_82443MX_3,
diff --git a/mkpatch/mkpatch.pl b/mkpatch/mkpatch.pl
index d660d01f..9049d211 100755
--- a/mkpatch/mkpatch.pl
+++ b/mkpatch/mkpatch.pl
@@ -220,12 +220,11 @@ CONFIG_I2C_I810
   This can also be built as a module which can be inserted and removed
   while the kernel is running.
 
-Intel 82371AB PIIX4(E) / ServerWorks OSB4 and CSB5
+Intel 82371AB PIIX4(E), ServerWorks OSB4, CSB5, CSB6, HT-1000
 CONFIG_I2C_PIIX4
   If you say yes to this option, support will be included for the
-  Intel PIIX4, PIIX4E, and 443MX, Serverworks OSB4/CSB5,
-  and SMSC Victory66 mainboard
-  I2C interfaces. This can also be
+  Intel PIIX4, PIIX4E, 443MX, Serverworks OSB4, CSB5, CSB6 and
+  HT-1000, and SMSC Victory66 mainboard I2C interfaces. This can also be
   built as a module which can be inserted and removed while the kernel
   is running.