Re: [PATCH 2/2] i2c-i801: Add PCI idents for Sandy Bridge SMBus controllers

[Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>]

On Sat, 30 Oct 2010 14:49:31 +0100 (BST), David Woodhouse wrote:
> 
> Signed-off-by: David Woodhouse <David.Woodhouse-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> ---
>   drivers/i2c/busses/i2c-i801.c |   13 +++++++++++++
>   1 files changed, 13 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
> index 6e8c12c..415f58d 100644
> --- a/drivers/i2c/busses/i2c-i801.c
> +++ b/drivers/i2c/busses/i2c-i801.c
> @@ -45,6 +45,10 @@
>     ICH10                 0x3a60     32     hard     yes     yes     yes
>     5/3400 Series (PCH)   0x3b30     32     hard     yes     yes     yes
>     Cougar Point (PCH)    0x1c22     32     hard     yes     yes     yes
> +  Sandy Bridge (PCH)    0x1d22     32     hard     yes     yes     yes
> +  Sandy Bridge (EVA)    0x1d70     32     hard     yes     yes     yes
> +  Sandy Bridge (EVA)    0x1d71     32     hard     yes     yes     yes
> +  Sandy Bridge (EVA)    0x1d72     32     hard     yes     yes     yes

This doesn't apply, because of the following pending patch which is
also adding support for a new driver (so touching the exact same areas
of the driver):
ftp://ftp.kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/i2c-i801-add-intel-patsburg-device-id.patch

As a side note, I really don't get the point of using 4 different PCI
device IDs for exactly the same device. Intel should really start to
worry about their numbering space if they keep attributing IDs when
they don't need to. 16 bit is fast to exhaust...

> 
>     Features supported by this driver:
>     Software PEC                     no
> @@ -127,6 +131,11 @@
>   				 SMBHSTSTS_BUS_ERR | SMBHSTSTS_DEV_ERR | \
>   				 SMBHSTSTS_INTR)
> 
> +#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_SMBUS_PCH	0x1d22
> +#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_SMBUS_EVA1	0x1d70
> +#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_SMBUS_EVA2	0x1d71
> +#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_SMBUS_EVA3	0x1d72
> +

These should go to pci_ids.h together with all other similar defines.

>   struct i801_priv {
>   	struct i2c_adapter adapter;
>   	unsigned long smba;
> @@ -602,6 +611,10 @@ static const struct pci_device_id i801_ids[] = {
>   	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
>   	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS) },
>   	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_SMBUS_PCH) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_SMBUS_EVA1) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_SMBUS_EVA2) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_SMBUS_EVA3) },
>   	{ 0, }
>   };
> 

You also have to list the new device in drivers/i2c/busses/Kconfig and
Documentation/i2c/busses/i2c-i801.

-- 
Jean Delvare