[RESEND PATCH] i2c: ismt: Add Intel DNV PCI ID

[RESEND PATCH] i2c: ismt: Add Intel DNV PCI ID

[Mika Westerberg]

Intel DNV has the same iSMT SMBus host controller than Intel Avoton. Add
DNV PCI ID to the list of supported devices.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
Wolfram,

This is the same patch that conflicted with another patch by Alexandra [1].
We have now verified that it is the iSMT driver that is compatible with
this particular PCI ID (not i2c-i801.c). Not tested on a real hardware as I
do not have such machine available.

[1] https://patchwork.ozlabs.org/patch/584758/

 drivers/i2c/busses/i2c-ismt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c
index 7ba795b24e75..24c48e899a22 100644
--- a/drivers/i2c/busses/i2c-ismt.c
+++ b/drivers/i2c/busses/i2c-ismt.c
@@ -76,6 +76,7 @@
 #define PCI_DEVICE_ID_INTEL_S1200_SMT0	0x0c59
 #define PCI_DEVICE_ID_INTEL_S1200_SMT1	0x0c5a
 #define PCI_DEVICE_ID_INTEL_AVOTON_SMT	0x1f15
+#define PCI_DEVICE_ID_INTEL_DNV_SMT	0x19ac
 
 #define ISMT_DESC_ENTRIES	2	/* number of descriptor entries */
 #define ISMT_MAX_RETRIES	3	/* number of SMBus retries to attempt */
@@ -181,6 +182,7 @@ static const struct pci_device_id ismt_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT0) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT1) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_AVOTON_SMT) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_DNV_SMT) },
 	{ 0, }
 };
 
-- 
2.7.0

Re: [RESEND PATCH] i2c: ismt: Add Intel DNV PCI ID

[Andy Shevchenko]

On Fri, 2016-04-08 at 15:29 +0300, Mika Westerberg wrote:
> Intel DNV has the same iSMT SMBus host controller than Intel Avoton.
> Add
> DNV PCI ID to the list of supported devices.
> 
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> ---
> Wolfram,
> 
> This is the same patch that conflicted with another patch by Alexandra
> [1].
> We have now verified that it is the iSMT driver that is compatible
> with
> this particular PCI ID (not i2c-i801.c). Not tested on a real hardware
> as I
> do not have such machine available.
> 
> [1] https://patchwork.ozlabs.org/patch/584758/


For me seems that Mika is right and this is the right place to add the
ID.

> 
>  drivers/i2c/busses/i2c-ismt.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-
> ismt.c
> index 7ba795b24e75..24c48e899a22 100644
> --- a/drivers/i2c/busses/i2c-ismt.c
> +++ b/drivers/i2c/busses/i2c-ismt.c
> @@ -76,6 +76,7 @@
>  #define PCI_DEVICE_ID_INTEL_S1200_SMT0	0x0c59
>  #define PCI_DEVICE_ID_INTEL_S1200_SMT1	0x0c5a
>  #define PCI_DEVICE_ID_INTEL_AVOTON_SMT	0x1f15
> +#define PCI_DEVICE_ID_INTEL_DNV_SMT	0x19ac

Nit:
I still prefer to have IDs sorted by their values.

>  
>  #define ISMT_DESC_ENTRIES	2	/* number of descriptor
> entries */
>  #define ISMT_MAX_RETRIES	3	/* number of SMBus retries
> to attempt */
> @@ -181,6 +182,7 @@ static const struct pci_device_id ismt_ids[] = {
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
> PCI_DEVICE_ID_INTEL_S1200_SMT0) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
> PCI_DEVICE_ID_INTEL_S1200_SMT1) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
> PCI_DEVICE_ID_INTEL_AVOTON_SMT) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
> PCI_DEVICE_ID_INTEL_DNV_SMT) },
>  	{ 0, }
>  };
>  

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy