Message ID | 20230512115001.81309-3-jarkko.nikula@linux.intel.com |
---|---|
State | Accepted |
Headers | show |
Series | [v3,1/3] i2c: i801: Enlarge device name field in i801_ids table | expand |
Hi Jarkko, On Fri, May 12, 2023 at 02:50:01PM +0300, Jarkko Nikula wrote: > Add SMBus PCI ID on Intel Meteor Lake PCH-S. > > Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Andi
On Fri, 12 May 2023 14:50:01 +0300, Jarkko Nikula wrote: > Add SMBus PCI ID on Intel Meteor Lake PCH-S. > > Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> > --- > v3: Drop the idea to call this as Meteor Point-S in code since it's confusing. > Intel Meteor Lake-S platform can have the SMBus controller both in > SoC die and PCH. I decided earlier to call latter as Meteor Point-S since > it fitted nicely into i801_ids table and I saw it to be used somewhere in > internal documentation. But it's more historical naming convension for > PCHs and to be honest internal documentation uses mostly Meteor Lake PCH-S. > v2: "SOC/PCH" -> "SOC and PCH" in documentation and Kconfig. PCI ID > define according to updated patch 1/2. > --- > Documentation/i2c/busses/i2c-i801.rst | 2 +- > drivers/i2c/busses/Kconfig | 2 +- > drivers/i2c/busses/i2c-i801.c | 3 +++ > 3 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/Documentation/i2c/busses/i2c-i801.rst b/Documentation/i2c/busses/i2c-i801.rst > index ab9e850e8fe0..e76e68ccf718 100644 > --- a/Documentation/i2c/busses/i2c-i801.rst > +++ b/Documentation/i2c/busses/i2c-i801.rst > @@ -46,7 +46,7 @@ Supported adapters: > * Intel Emmitsburg (PCH) > * Intel Alder Lake (PCH) > * Intel Raptor Lake (PCH) > - * Intel Meteor Lake (SOC) > + * Intel Meteor Lake (SOC and PCH) > > Datasheets: Publicly available at the Intel website > > diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig > index 87600b4aacb3..3144ef99f040 100644 > --- a/drivers/i2c/busses/Kconfig > +++ b/drivers/i2c/busses/Kconfig > @@ -157,7 +157,7 @@ config I2C_I801 > Emmitsburg (PCH) > Alder Lake (PCH) > Raptor Lake (PCH) > - Meteor Lake (SOC) > + Meteor Lake (SOC and 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 bc2576188e0a..943b8e6d026d 100644 > --- a/drivers/i2c/busses/i2c-i801.c > +++ b/drivers/i2c/busses/i2c-i801.c > @@ -78,6 +78,7 @@ > * Raptor Lake-S (PCH) 0x7a23 32 hard yes yes yes > * Meteor Lake-P (SOC) 0x7e22 32 hard yes yes yes > * Meteor Lake SoC-S (SOC) 0xae22 32 hard yes yes yes > + * Meteor Lake PCH-S (PCH) 0x7f23 32 hard yes yes yes > * > * Features supported by this driver: > * Software PEC no > @@ -234,6 +235,7 @@ > #define PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_S_SMBUS 0x7a23 > #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_S_SMBUS 0x7aa3 > #define PCI_DEVICE_ID_INTEL_METEOR_LAKE_P_SMBUS 0x7e22 > +#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_PCH_S_SMBUS 0x7f23 > #define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS 0x8c22 > #define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS 0x8ca2 > #define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS 0x8d22 > @@ -1041,6 +1043,7 @@ static const struct pci_device_id i801_ids[] = { > { PCI_DEVICE_DATA(INTEL, RAPTOR_LAKE_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, > { PCI_DEVICE_DATA(INTEL, METEOR_LAKE_P_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, > { PCI_DEVICE_DATA(INTEL, METEOR_LAKE_SOC_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, > + { PCI_DEVICE_DATA(INTEL, METEOR_LAKE_PCH_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, > { 0, } > }; > Reviewed-by: Jean Delvare <jdelvare@suse.de>
diff --git a/Documentation/i2c/busses/i2c-i801.rst b/Documentation/i2c/busses/i2c-i801.rst index ab9e850e8fe0..e76e68ccf718 100644 --- a/Documentation/i2c/busses/i2c-i801.rst +++ b/Documentation/i2c/busses/i2c-i801.rst @@ -46,7 +46,7 @@ Supported adapters: * Intel Emmitsburg (PCH) * Intel Alder Lake (PCH) * Intel Raptor Lake (PCH) - * Intel Meteor Lake (SOC) + * Intel Meteor Lake (SOC and PCH) Datasheets: Publicly available at the Intel website diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 87600b4aacb3..3144ef99f040 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -157,7 +157,7 @@ config I2C_I801 Emmitsburg (PCH) Alder Lake (PCH) Raptor Lake (PCH) - Meteor Lake (SOC) + Meteor Lake (SOC and 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 bc2576188e0a..943b8e6d026d 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -78,6 +78,7 @@ * Raptor Lake-S (PCH) 0x7a23 32 hard yes yes yes * Meteor Lake-P (SOC) 0x7e22 32 hard yes yes yes * Meteor Lake SoC-S (SOC) 0xae22 32 hard yes yes yes + * Meteor Lake PCH-S (PCH) 0x7f23 32 hard yes yes yes * * Features supported by this driver: * Software PEC no @@ -234,6 +235,7 @@ #define PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_S_SMBUS 0x7a23 #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_S_SMBUS 0x7aa3 #define PCI_DEVICE_ID_INTEL_METEOR_LAKE_P_SMBUS 0x7e22 +#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_PCH_S_SMBUS 0x7f23 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS 0x8c22 #define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS 0x8ca2 #define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS 0x8d22 @@ -1041,6 +1043,7 @@ static const struct pci_device_id i801_ids[] = { { PCI_DEVICE_DATA(INTEL, RAPTOR_LAKE_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, { PCI_DEVICE_DATA(INTEL, METEOR_LAKE_P_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, { PCI_DEVICE_DATA(INTEL, METEOR_LAKE_SOC_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, + { PCI_DEVICE_DATA(INTEL, METEOR_LAKE_PCH_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, { 0, } };
Add SMBus PCI ID on Intel Meteor Lake PCH-S. Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> --- v3: Drop the idea to call this as Meteor Point-S in code since it's confusing. Intel Meteor Lake-S platform can have the SMBus controller both in SoC die and PCH. I decided earlier to call latter as Meteor Point-S since it fitted nicely into i801_ids table and I saw it to be used somewhere in internal documentation. But it's more historical naming convension for PCHs and to be honest internal documentation uses mostly Meteor Lake PCH-S. v2: "SOC/PCH" -> "SOC and PCH" in documentation and Kconfig. PCI ID define according to updated patch 1/2. --- Documentation/i2c/busses/i2c-i801.rst | 2 +- drivers/i2c/busses/Kconfig | 2 +- drivers/i2c/busses/i2c-i801.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-)