Skip to contentSkip to conversation

i2c-i801: SMBus patch for Intel Cougar Point DeviceIDs

PATCH In review Seth Heasley 3 participants 4 messages Jan 13, 2010 – Jan 19, 2010

Subsystems (2)
I2C subsystem host drivers I2C/smbus controller drivers for pc
lore
Share & tools
lore

Seth Heasley

author
#0 lore raw

PATCH 1/1 i2c-i801: SMBus patch for Intel Cougar Point DeviceIDs

This patch adds the Intel Cougar Point (PCH) SMBus Controller DeviceIDs.

Signed-off-by Seth Heasley <[email protected]>
drivers/i2c/busses/i2c-i801.c renamed from drivers/i2c/busses/i2c-i801.c.orig +4 -1
@@ -41,7 +41,8 @@
   Tolapai               0x5032     32     hard     yes     yes     yes
   ICH10                 0x3a30     32     hard     yes     yes     yes
   ICH10                 0x3a60     32     hard     yes     yes     yes
-  PCH                   0x3b30     32     hard     yes     yes     yes
+  3400/5 Series (PCH)   0x3b30     32     hard     yes     yes     yes
+  CPT                   0x1c22     32     hard     yes     yes     yes
 
   Features supported by this driver:
   Software PEC                     no

@@ -578,6 +579,7 @@
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
 	{ 0, }
 };
 

@@ -707,6 +709,7 @@
 	case PCI_DEVICE_ID_INTEL_ICH10_4:
 	case PCI_DEVICE_ID_INTEL_ICH10_5:
 	case PCI_DEVICE_ID_INTEL_PCH_SMBUS:
+	case PCI_DEVICE_ID_INTEL_CPT_SMBUS:
 		i801_features |= FEATURE_I2C_BLOCK_READ;
 		/* fall through */
 	case PCI_DEVICE_ID_INTEL_82801DB_3:
drivers/i2c/busses/Kconfig renamed from drivers/i2c/busses/Kconfig.orig +1 -0
@@ -98,6 +98,7 @@
 	    Tolapai
 	    ICH10
 	    PCH
+	    CPT
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called i2c-i801.
#1 lore raw

Seems like Jean or Ben should take this.

Jesse

Quoted 48 lines · On Tue, 12 Jan 2010 16:58:53 -0800 Seth Heasley <[email protected]> wrote:

This patch adds the Intel Cougar Point (PCH) SMBus Controller DeviceIDs.

Signed-off-by Seth Heasley <[email protected]>

--- linux-2.6.32.3/drivers/i2c/busses/i2c-i801.c.orig

2010-01-06 15:07:45.000000000 -0800 +++
linux-2.6.32.3/drivers/i2c/busses/i2c-i801.c	2010-01-07
13:10:28.000000000 -0800 @@ -41,7 +41,8 @@ Tolapai
0x5032     32     hard     yes     yes     yes ICH10
0x3a30     32     hard     yes     yes     yes ICH10
0x3a60     32     hard     yes     yes     yes
-  PCH                   0x3b30     32     hard     yes     yes

yes
+ 3400/5 Series (PCH) 0x3b30 32 hard yes yes
yes
+ CPT 0x1c22 32 hard yes yes
yes
Features supported by this driver:
Software PEC no

drivers/i2c/busses/i2c-i801.c renamed from drivers/i2c/busses/i2c-i801.c.orig +2 -1
@@ -578,6 +579,7 @@
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
 PCI_DEVICE_ID_INTEL_ICH10_4) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
 PCI_DEVICE_ID_INTEL_ICH10_5) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
 PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
 PCI_DEVICE_ID_INTEL_CPT_SMBUS) }, { 0, }
 };

@@ -707,6 +709,7 @@
 	case PCI_DEVICE_ID_INTEL_ICH10_4:
 	case PCI_DEVICE_ID_INTEL_ICH10_5:
 	case PCI_DEVICE_ID_INTEL_PCH_SMBUS:
+	case PCI_DEVICE_ID_INTEL_CPT_SMBUS:
 		i801_features |= FEATURE_I2C_BLOCK_READ;
 		/* fall through */
 	case PCI_DEVICE_ID_INTEL_82801DB_3:
--- linux-2.6.32.3/drivers/i2c/busses/Kconfig.orig	2010-01-06

15:07:45.000000000 -0800 +++
linux-2.6.32.3/drivers/i2c/busses/Kconfig 2010-01-07
13:10:28.000000000 -0800 @@ -98,6 +98,7 @@ Tolapai

drivers/i2c/busses/Kconfig renamed from drivers/i2c/busses/Kconfig.orig +1 -0
 	    ICH10
 	    PCH
+	    CPT
 
 	  This driver can also be built as a module.  If so, the

module will be called i2c-i801.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
#2 lore raw
Quoted 1 line · Jesse Barnes

Seems like Jean or Ben should take this.

I'll take it. I was only waiting for you to pick the PCI device defines first.

Signature · 1 line
Jean Delvare
#3 lore raw
In reply to Seth Heasley

Hi Seth,

Please note that the i2c mailing list address has changed.

Quoted 1 line · Seth Heasley

This patch adds the Intel Cougar Point (PCH) SMBus Controller DeviceIDs.

This comment suggests that Cougar Point == PCH, while the comments in i2c-i801 suggests otherwise. Who is right?

Quoted 34 lines
Signed-off-by Seth Heasley <[email protected]>
drivers/i2c/busses/i2c-i801.c renamed from drivers/i2c/busses/i2c-i801.c.orig +4 -1
@@ -41,7 +41,8 @@
   Tolapai               0x5032     32     hard     yes     yes     yes
   ICH10                 0x3a30     32     hard     yes     yes     yes
   ICH10                 0x3a60     32     hard     yes     yes     yes
-  PCH                   0x3b30     32     hard     yes     yes     yes
+  3400/5 Series (PCH)   0x3b30     32     hard     yes     yes     yes
+  CPT                   0x1c22     32     hard     yes     yes     yes
 
   Features supported by this driver:
   Software PEC                     no

@@ -578,6 +579,7 @@
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
 	{ 0, }
 };
 

@@ -707,6 +709,7 @@
 	case PCI_DEVICE_ID_INTEL_ICH10_4:
 	case PCI_DEVICE_ID_INTEL_ICH10_5:
 	case PCI_DEVICE_ID_INTEL_PCH_SMBUS:
+	case PCI_DEVICE_ID_INTEL_CPT_SMBUS:
 		i801_features |= FEATURE_I2C_BLOCK_READ;
 		/* fall through */
 	case PCI_DEVICE_ID_INTEL_82801DB_3:

drivers/i2c/busses/Kconfig line 101

Quoted 4 lines
drivers/i2c/busses/Kconfig renamed from drivers/i2c/busses/Kconfig.orig +1 -0
@@ -98,6 +98,7 @@
 	    Tolapai
 	    ICH10
 	    PCH
+	    CPT

It might be clear for you that "CPT" means "Cougar Point", but for the reader it may not be. I'd rather list the full chip name. Same in i2c-i801.c's header comment, BTW.

drivers/i2c/busses/Kconfig line 104

Quoted 3 lines
drivers/i2c/busses/Kconfig renamed from drivers/i2c/busses/Kconfig.orig +0 -0
 	  This driver can also be built as a module.  If so, the module
 	  will be called i2c-i801.

Documentation/i2c/busses/i2c-i801 needs to be updated as well.

Signature · 1 line
Jean Delvare