From f0c355da8c47b76cc616215872f4ca597698c62d Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sun, 14 Oct 2007 10:23:09 +0000
Subject: [PATCH] Add support for the Intel Tolapai to i2c-i801. This is a
 backport from Linux 2.6, original patch by Jason Gaston.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4946 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES                  |  1 +
 README                   |  1 +
 doc/busses/i2c-i801      |  1 +
 kernel/busses/i2c-i801.c | 13 ++++++++++++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 894ef44b..160dd3a9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@ SVN HEAD
   Makefile: Fix kernel version detection (#2187)
   Man page sensord.8: Update
   Module fscher: Add missing read of control register (2.6 backport)
+  Module i2c-i801: Add Tolapai support (2.6 backport)
   Module i2c-piix4: Add ATI SB700 and SB800 support (2.6 backport)
   Module lm93: Fix an array overrun (2.6 backport)
   Program sensord: Fix f71805f fans
diff --git a/README b/README
index 046096f7..40576fd9 100644
--- a/README
+++ b/README
@@ -51,6 +51,7 @@ At least the following I2C/SMBus adapters are supported:
   DEC 21272/21274 (Tsunami/Typhoon - on Alpha boards)
   Intel ICH/ICH0/ICH2/ICH3/ICH4/ICH5/ICH6/ICH7/ICH8/ICH9 (82801xx)
   Intel 6300ESB, 631xESB/632xESB (ESB2)
+  Intel Tolapai
   Intel PIIX4 (used in many Intel chipsets)
   Intel I810/I810E/I815/I845G GMCH
   Intel 82443MX (440MX)
diff --git a/doc/busses/i2c-i801 b/doc/busses/i2c-i801
index ec218287..831bfee0 100644
--- a/doc/busses/i2c-i801
+++ b/doc/busses/i2c-i801
@@ -15,6 +15,7 @@ Supported adapters:
   * Intel 6300ESB/ESB2
   * Intel 82801FB/FR/FW/FRW (ICH6)
   * Intel ICH7/ICH8/ICH9
+  * Intel Tolapai
     Datasheets: Publicly available at the Intel website
 
 Authors: Frodo Looijaard <frodol@dds.nl>, Philip Edelbrock
diff --git a/kernel/busses/i2c-i801.c b/kernel/busses/i2c-i801.c
index f8359a73..9f04a9d1 100644
--- a/kernel/busses/i2c-i801.c
+++ b/kernel/busses/i2c-i801.c
@@ -104,6 +104,10 @@
 #define PCI_DEVICE_ID_INTEL_ICH9_6	0x2930
 #endif
 
+#ifndef PCI_DEVICE_ID_INTEL_TOLAPAI_1
+#define PCI_DEVICE_ID_INTEL_TOLAPAI_1	0x5032
+#endif
+
 #ifdef I2C_CLIENT_PEC
 #define HAVE_PEC
 #endif
@@ -175,7 +179,8 @@ static int __devinit i801_setup(struct pci_dev *dev)
 	    dev->device == PCI_DEVICE_ID_INTEL_ICH6_16 ||
 	    dev->device == PCI_DEVICE_ID_INTEL_ICH7_17 ||
 	    dev->device == PCI_DEVICE_ID_INTEL_ICH8_5 ||
-	    dev->device == PCI_DEVICE_ID_INTEL_ICH9_6)
+	    dev->device == PCI_DEVICE_ID_INTEL_ICH9_6 ||
+	    dev->device == PCI_DEVICE_ID_INTEL_TOLAPAI_1)
 		isich4 = 1;
 	else
 		isich4 = 0;
@@ -680,6 +685,12 @@ static struct pci_device_id i801_ids[] __devinitdata = {
 		.subvendor =	PCI_ANY_ID,
 		.subdevice =	PCI_ANY_ID,
 	},
+	{
+		.vendor =	PCI_VENDOR_ID_INTEL,
+		.device =	PCI_DEVICE_ID_INTEL_TOLAPAI_1,
+		.subvendor =	PCI_ANY_ID,
+		.subdevice =	PCI_ANY_ID,
+	},
 	{ 0, }
 };