Commit 790591f4 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Wolfram Sang
Browse files

i2c: i801: Correct Intel Jasper Lake SOC naming 



There is no suffix applied to Intel Jasper Lake SOC. Remove it
from the comments and definitions. Besides that, it's a SOC,
thus replace PCH with SOC where it appropriate.

Fixes: e0c61c04 ("i2c: i801: Add support for Intel Jasper Lake")
Cc: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 7787657d

Documentation/i2c/busses/i2c-i801.rst

+1 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ Supported adapters: 
  * Intel Comet Lake (PCH)

  * Intel Comet Lake (PCH)

  * Intel Elkhart Lake (PCH)

  * Intel Elkhart Lake (PCH)

  * Intel Tiger Lake (PCH)

  * Intel Tiger Lake (PCH)

  * Intel Jasper Lake (PCH)

  * Intel Jasper Lake (SOC)





   Datasheets: Publicly available at the Intel website

   Datasheets: Publicly available at the Intel website

drivers/i2c/busses/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -145,7 +145,7 @@ config I2C_I801 
	    Comet Lake (PCH)

	    Comet Lake (PCH)

	    Elkhart Lake (PCH)

	    Elkhart Lake (PCH)

	    Tiger Lake (PCH)

	    Tiger Lake (PCH)

	    Jasper Lake (PCH)

	    Jasper Lake (SOC)





	  This driver can also be built as a module.  If so, the module

	  This driver can also be built as a module.  If so, the module

	  will be called i2c-i801.

	  will be called i2c-i801.

drivers/i2c/busses/i2c-i801.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ 
 * Comet Lake-H (PCH)		0x06a3	32	hard	yes	yes	yes

 * Comet Lake-H (PCH)		0x06a3	32	hard	yes	yes	yes

 * Elkhart Lake (PCH)		0x4b23	32	hard	yes	yes	yes

 * Elkhart Lake (PCH)		0x4b23	32	hard	yes	yes	yes

 * Tiger Lake-LP (PCH)		0xa0a3	32	hard	yes	yes	yes

 * Tiger Lake-LP (PCH)		0xa0a3	32	hard	yes	yes	yes

 * Jasper Lake-N (PCH)		0x4da3	32	hard	yes	yes	yes

 * Jasper Lake (SOC)		0x4da3	32	hard	yes	yes	yes

 *

 *

 * Features supported by this driver:

 * Features supported by this driver:

 * Software PEC				no

 * Software PEC				no
@@ -226,7 +226,7 @@ 
#define PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS		0x34a3

#define PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS		0x34a3

#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS		0x3b30

#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS		0x3b30

#define PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS		0x4b23

#define PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS		0x4b23

#define PCI_DEVICE_ID_INTEL_JASPER_LAKE_N_SMBUS		0x4da3

#define PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS		0x4da3

#define PCI_DEVICE_ID_INTEL_BROXTON_SMBUS		0x5ad4

#define PCI_DEVICE_ID_INTEL_BROXTON_SMBUS		0x5ad4

#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS		0x8c22

#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS		0x8c22

#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS		0x8ca2

#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS		0x8ca2
@@ -1076,7 +1076,7 @@ static const struct pci_device_id i801_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COMETLAKE_H_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COMETLAKE_H_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TIGERLAKE_LP_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TIGERLAKE_LP_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_JASPER_LAKE_N_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS) },

	{ 0, }

	{ 0, }

};

};
@@ -1759,7 +1759,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	case PCI_DEVICE_ID_INTEL_COMETLAKE_H_SMBUS:

	case PCI_DEVICE_ID_INTEL_COMETLAKE_H_SMBUS:

	case PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS:

	case PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS:

	case PCI_DEVICE_ID_INTEL_TIGERLAKE_LP_SMBUS:

	case PCI_DEVICE_ID_INTEL_TIGERLAKE_LP_SMBUS:

	case PCI_DEVICE_ID_INTEL_JASPER_LAKE_N_SMBUS:

	case PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS:

		priv->features |= FEATURE_BLOCK_PROC;

		priv->features |= FEATURE_BLOCK_PROC;

		priv->features |= FEATURE_I2C_BLOCK_READ;

		priv->features |= FEATURE_I2C_BLOCK_READ;

		priv->features |= FEATURE_IRQ;

		priv->features |= FEATURE_IRQ;