2010-01-13 01:03:26

by Seth Heasley

Subject: [PATCH 2.6.32.3] 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]>

--- 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
@@ -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
ICH10
PCH
+ CPT

This driver can also be built as a module. If so, the module
will be called i2c-i801.

2010-01-19 10:19:14

by Jean Delvare

Subject: Re: [PATCH 2.6.32.3] i2c-i801: SMBus patch for Intel Cougar Point DeviceIDs

On Fri, 15 Jan 2010 10:15:54 -0800, Jesse Barnes wrote:
> 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.

--
Jean Delvare

2010-01-19 11:00:47

by Jean Delvare

Subject: Re: [PATCH 2.6.32.3] i2c-i801: SMBus patch for Intel Cougar Point DeviceIDs

Hi Seth,

Please note that the i2c mailing list address has changed.

On Tue, 12 Jan 2010 16:58:53 -0800, Seth Heasley wrote:
> 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?

>
> 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
> @@ -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
> 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.

>
> 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.

--
Jean Delvare

2010-01-15 18:15:55

by Jesse Barnes

Subject: Re: [PATCH 2.6.32.3] i2c-i801: SMBus patch for Intel Cougar Point DeviceIDs

Seems like Jean or Ben should take this.

Jesse

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
> @@ -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
> ICH10
> PCH
> + CPT
>
> This driver can also be built as a module. If so, the
> module will be called i2c-i801.
>


--
Jesse Barnes, Intel Open Source Technology Center