diff mbox series

i2c: i801: Add support for Intel Comet Lake

Message ID 20190315092627.2971-1-jarkko.nikula@linux.intel.com
State Superseded
Headers show
Series i2c: i801: Add support for Intel Comet Lake | expand

Commit Message

Jarkko Nikula March 15, 2019, 9:26 a.m. UTC
Add PCI ID for Intel Comet Lake PCH.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
 Documentation/i2c/busses/i2c-i801 | 1 +
 drivers/i2c/busses/Kconfig        | 1 +
 drivers/i2c/busses/i2c-i801.c     | 4 ++++
 3 files changed, 6 insertions(+)

Comments

Peter Rosin March 15, 2019, 10:04 a.m. UTC | #1
On 2019-03-15 10:26, Jarkko Nikula wrote:
> Add PCI ID for Intel Comet Lake PCH.
> 
> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
> ---
>  Documentation/i2c/busses/i2c-i801 | 1 +
>  drivers/i2c/busses/Kconfig        | 1 +
>  drivers/i2c/busses/i2c-i801.c     | 4 ++++
>  3 files changed, 6 insertions(+)
> 
> diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801
> index d1ee484a787d..ee9984f35868 100644
> --- a/Documentation/i2c/busses/i2c-i801
> +++ b/Documentation/i2c/busses/i2c-i801
> @@ -36,6 +36,7 @@ Supported adapters:
>    * Intel Cannon Lake (PCH)
>    * Intel Cedar Fork (PCH)
>    * Intel Ice Lake (PCH)
> +  * Intel Comet Lake (PCH)
>     Datasheets: Publicly available at the Intel website
>  
>  On Intel Patsburg and later chipsets, both the normal host SMBus controller
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index f2c681971201..f8979abb9a19 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -131,6 +131,7 @@ config I2C_I801
>  	    Cannon Lake (PCH)
>  	    Cedar Fork (PCH)
>  	    Ice Lake (PCH)
> +	    Comet Lake (PCH)
>  
>  	  This driver can also be built as a module.  If so, the module
>  	  will be called i2c-i801.
> diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
> index c91e145ef5a5..365ae41777e8 100644
> --- a/drivers/i2c/busses/i2c-i801.c
> +++ b/drivers/i2c/busses/i2c-i801.c
> @@ -71,6 +71,7 @@
>   * Cannon Lake-LP (PCH)		0x9da3	32	hard	yes	yes	yes
>   * Cedar Fork (PCH)		0x18df	32	hard	yes	yes	yes
>   * Ice Lake-LP (PCH)		0x34a3	32	hard	yes	yes	yes
> + * Comet Lake (PCH)		0x02a3	32	hard	yes	yes	yes
>   *
>   * Features supported by this driver:
>   * Software PEC				no
> @@ -240,6 +241,7 @@
>  #define PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS	0xa223
>  #define PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS	0xa2a3
>  #define PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS		0xa323
> +#define PCI_DEVICE_ID_INTEL_COMET_LAKE_SMBUS		0x02a3

Perhaps lose an underscore -> PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS to
match the previous names?

Cheers,
Peter

>  
>  struct i801_mux_config {
>  	char *gpio_chip;
> @@ -1038,6 +1040,7 @@ static const struct pci_device_id i801_ids[] = {
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_LP_SMBUS) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COMET_LAKE_SMBUS) },
>  	{ 0, }
>  };
>  
> @@ -1534,6 +1537,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
>  	case PCI_DEVICE_ID_INTEL_DNV_SMBUS:
>  	case PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS:
>  	case PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS:
> +	case PCI_DEVICE_ID_INTEL_COMET_LAKE_SMBUS:
>  		priv->features |= FEATURE_I2C_BLOCK_READ;
>  		priv->features |= FEATURE_IRQ;
>  		priv->features |= FEATURE_SMBUS_PEC;
>
Jarkko Nikula March 15, 2019, 10:50 a.m. UTC | #2
On 3/15/19 12:04 PM, Peter Rosin wrote:
> On 2019-03-15 10:26, Jarkko Nikula wrote:
>> --- a/drivers/i2c/busses/i2c-i801.c
>> +++ b/drivers/i2c/busses/i2c-i801.c
>> @@ -71,6 +71,7 @@
>>    * Cannon Lake-LP (PCH)		0x9da3	32	hard	yes	yes	yes
>>    * Cedar Fork (PCH)		0x18df	32	hard	yes	yes	yes
>>    * Ice Lake-LP (PCH)		0x34a3	32	hard	yes	yes	yes
>> + * Comet Lake (PCH)		0x02a3	32	hard	yes	yes	yes
>>    *
>>    * Features supported by this driver:
>>    * Software PEC				no
>> @@ -240,6 +241,7 @@
>>   #define PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS	0xa223
>>   #define PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS	0xa2a3
>>   #define PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS		0xa323
>> +#define PCI_DEVICE_ID_INTEL_COMET_LAKE_SMBUS		0x02a3
> 
> Perhaps lose an underscore -> PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS to
> match the previous names?
> 
Indeed, it looks better. I'll change.
diff mbox series

Patch

diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801
index d1ee484a787d..ee9984f35868 100644
--- a/Documentation/i2c/busses/i2c-i801
+++ b/Documentation/i2c/busses/i2c-i801
@@ -36,6 +36,7 @@  Supported adapters:
   * Intel Cannon Lake (PCH)
   * Intel Cedar Fork (PCH)
   * Intel Ice Lake (PCH)
+  * Intel Comet Lake (PCH)
    Datasheets: Publicly available at the Intel website
 
 On Intel Patsburg and later chipsets, both the normal host SMBus controller
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index f2c681971201..f8979abb9a19 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -131,6 +131,7 @@  config I2C_I801
 	    Cannon Lake (PCH)
 	    Cedar Fork (PCH)
 	    Ice Lake (PCH)
+	    Comet Lake (PCH)
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called i2c-i801.
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index c91e145ef5a5..365ae41777e8 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -71,6 +71,7 @@ 
  * Cannon Lake-LP (PCH)		0x9da3	32	hard	yes	yes	yes
  * Cedar Fork (PCH)		0x18df	32	hard	yes	yes	yes
  * Ice Lake-LP (PCH)		0x34a3	32	hard	yes	yes	yes
+ * Comet Lake (PCH)		0x02a3	32	hard	yes	yes	yes
  *
  * Features supported by this driver:
  * Software PEC				no
@@ -240,6 +241,7 @@ 
 #define PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS	0xa223
 #define PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS	0xa2a3
 #define PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS		0xa323
+#define PCI_DEVICE_ID_INTEL_COMET_LAKE_SMBUS		0x02a3
 
 struct i801_mux_config {
 	char *gpio_chip;
@@ -1038,6 +1040,7 @@  static const struct pci_device_id i801_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_LP_SMBUS) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COMET_LAKE_SMBUS) },
 	{ 0, }
 };
 
@@ -1534,6 +1537,7 @@  static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
 	case PCI_DEVICE_ID_INTEL_DNV_SMBUS:
 	case PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS:
 	case PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS:
+	case PCI_DEVICE_ID_INTEL_COMET_LAKE_SMBUS:
 		priv->features |= FEATURE_I2C_BLOCK_READ;
 		priv->features |= FEATURE_IRQ;
 		priv->features |= FEATURE_SMBUS_PEC;