i2c: i801: Add support for Intel Meteor Lake-S SoC
Subsystems (3)
PATCH 1/2 i2c: i801: Add support for Intel Meteor Lake-S SoC
Add SMBus PCI ID on Intel Meteor Lake-S SoC South.
--- drivers/i2c/busses/i2c-i801.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/i2c/busses/i2c-i801.c +3 -0
@@ -77,6 +77,7 @@* Alder Lake-M (PCH) 0x54a3 32 hard yes yes yes * Raptor Lake-S (PCH) 0x7a23 32 hard yes yes yes * Meteor Lake-P (SOC) 0x7e22 32 hard yes yes yes +* Meteor Lake-S (SOC) 0xae22 32 hard yes yes yes * * Features supported by this driver: * Software PEC no
@@ -233,6 +234,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_S_SMBUS 0xae22#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS 0x8c22#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS 0x8ca2#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS 0x8d22
@@ -1038,6 +1040,7 @@ static const struct pci_device_id i801_ids[] = { { PCI_DEVICE_DATA(INTEL, ALDER_LAKE_M_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, { 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_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, { 0, } };
Signature · 1 line
2.39.2
PATCH 2/2 i2c: i801: Add support for Intel Meteor Lake PCH-S
Add SMBus PCI ID on Intel Meteor Lake PCH-S. Also called as Meteor Point-S which is used in the code to distinguish from Meteor Lake-S SoC but call both as Meteor Lake in documentation and Kconfig.
--- 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(-)
Documentation/i2c/busses/i2c-i801.rst +1 -1
@@ -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/PCH) Datasheets: Publicly available at the Intel website
drivers/i2c/busses/Kconfig +1 -1
@@ -157,7 +157,7 @@ config I2C_I801 Emmitsburg (PCH) Alder Lake (PCH) Raptor Lake (PCH) - Meteor Lake (SOC) + Meteor Lake (SOC/PCH) This driver can also be built as a module. If so, the module will be called i2c-i801.
drivers/i2c/busses/i2c-i801.c +3 -0
@@ -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-S (SOC) 0xae22 32 hard yes yes yes +* Meteor Point-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_POINT_S_SMBUS 0x7f23#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_S_SMBUS 0xae22#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS 0x8c22#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS 0x8ca2
@@ -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_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, + { PCI_DEVICE_DATA(INTEL, METEOR_POINT_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, { 0, } };
Signature · 1 line
2.39.2
Re: [PATCH 2/2] i2c: i801: Add support for Intel Meteor Lake PCH-S
Hi Jarkko,
Quoted 16 lines · Jarkko Nikula
Add SMBus PCI ID on Intel Meteor Lake PCH-S. Also called as Meteor Point-S which is used in the code to distinguish from Meteor Lake-S SoC but call both as Meteor Lake in documentation and
Kconfig.Signed-off-by Jarkko Nikula <[email protected]>--- 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(-)Documentation/i2c/busses/i2c-i801.rst +0
-0
Documentation/i2c/busses/i2c-i801.rst Supported adapters: · line 49
Quoted 5 lines
Documentation/i2c/busses/i2c-i801.rst +1
-1@@ -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/PCH)
I'm confused. The patch actually adds support for Meteor Point (S). So shouldn't you add:
* Intel Meteor Point (PCH)
instead of modifying the existing line?
drivers/i2c/busses/Kconfig config I2C_I801 · line 160
Quoted 13 lines
Documentation/i2c/busses/i2c-i801.rst +0
-0Datasheets: Publicly available at the Intel websitedrivers/i2c/busses/Kconfig +1
-1@@ -157,7 +157,7 @@ config I2C_I801 Emmitsburg (PCH) Alder Lake (PCH) Raptor Lake (PCH) - Meteor Lake (SOC) + Meteor Lake (SOC/PCH)
Ditto.
Quoted 1 line
This driver can also be built as a module. If so, the module
Quoted 22 lines
drivers/i2c/busses/Kconfig +0
-0will be called i2c-i801.drivers/i2c/busses/i2c-i801.c +2
-0@@ -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-S (SOC) 0xae22 32 hard yes yes yes +* Meteor Point-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_POINT_S_SMBUS 0x7f23#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_S_SMBUS 0xae22#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS 0x8c22#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS 0x8ca2
drivers/i2c/busses/i2c-i801.c static const struct pci_device_id i801_ids[] = { · line 1049
Quoted 7 lines
drivers/i2c/busses/i2c-i801.c +1
-0@@ -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_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, + { PCI_DEVICE_DATA(INTEL, METEOR_POINT_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, { 0, } };
Rest looks good.
Signature · 2 lines
Jean Delvare SUSE L3 Support
Re: [PATCH 2/2] i2c: i801: Add support for Intel Meteor Lake PCH-S
Quoted 29 lines · Jean Delvare
Hi Jarkko,
Quoted 16 lines · Jarkko Nikula
Add SMBus PCI ID on Intel Meteor Lake PCH-S. Also called as Meteor Point-S which is used in the code to distinguish from Meteor Lake-S SoC but call both as Meteor Lake in documentation and
Kconfig.Signed-off-by Jarkko Nikula <[email protected]>--- 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(-)Documentation/i2c/busses/i2c-i801.rst +0
-0Documentation/i2c/busses/i2c-i801.rst Supported adapters: · line 49
Quoted 5 lines
Documentation/i2c/busses/i2c-i801.rst +1
-1@@ -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/PCH)I'm confused. The patch actually adds support for Meteor Point (S). So shouldn't you add:
* Intel Meteor Point (PCH)
Quoted 2 lines
instead of modifying the existing line?
Idea was to follow my earlier commit 80d943ab19e9 ("i2c: i801: Consolidate chipset names in documentation and Kconfig") to use single name for the same family instead of listing all possible variants.
Like here we have already support for Meteor Lake -P SoC and now adding support for Meteor Lake -S that will have both in SoC SMBus and PCH SMBus controllers.
I realized actually Alder Lake (PCH) above may not be correct. True for Alder Lake -S PCH but now thinking -P and -M variants may be actually SoCs.
Confusing, yes I agree :-)
Hi Jarkko,
Quoted 20 lines · Jarkko Nikula
Add SMBus PCI ID on Intel Meteor Lake-S SoC South.
Signed-off-by Jarkko Nikula <[email protected]>--- drivers/i2c/busses/i2c-i801.c | 3 +++ 1 file changed, 3 insertions(+)drivers/i2c/busses/i2c-i801.c +1
-0@@ -77,6 +77,7 @@* Alder Lake-M (PCH) 0x54a3 32 hard yes yes yes * Raptor Lake-S (PCH) 0x7a23 32 hard yes yes yes * Meteor Lake-P (SOC) 0x7e22 32 hard yes yes yes +* Meteor Lake-S (SOC) 0xae22 32 hard yes yes yes * * Features supported by this driver: * Software PEC no
drivers/i2c/busses/i2c-i801.c line 240
Quoted 7 lines
drivers/i2c/busses/i2c-i801.c +1
-0@@ -233,6 +234,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_S_SMBUS 0xae22#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS 0x8c22#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS 0x8ca2#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS 0x8d22
Sorry for nitpicking but since 34b57f40a6a2 ("i2c: i801: sort IDs alphabetically") this list is supposed to be sorted by ID.
drivers/i2c/busses/i2c-i801.c static const struct pci_device_id i801_ids[] = { · line 1046
Quoted 8 lines
drivers/i2c/busses/i2c-i801.c +1
-0@@ -1038,6 +1040,7 @@ static const struct pci_device_id i801_ids[] = { { PCI_DEVICE_DATA(INTEL, ALDER_LAKE_M_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, { 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_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, { 0, } };
Other than that, looks good.
Signature · 2 lines
Jean Delvare SUSE L3 Support
Quoted 25 lines · Jean Delvare
Hi Jarkko,
Quoted 22 lines · Jarkko Nikula
Add SMBus PCI ID on Intel Meteor Lake-S SoC South.
Signed-off-by Jarkko Nikula <[email protected]>--- drivers/i2c/busses/i2c-i801.c | 3 +++ 1 file changed, 3 insertions(+)drivers/i2c/busses/i2c-i801.c +1
-0@@ -77,6 +77,7 @@* Alder Lake-M (PCH) 0x54a3 32 hard yes yes yes * Raptor Lake-S (PCH) 0x7a23 32 hard yes yes yes * Meteor Lake-P (SOC) 0x7e22 32 hard yes yes yes +* Meteor Lake-S (SOC) 0xae22 32 hard yes yes yes * * Features supported by this driver: * Software PEC no @@ -233,6 +234,7 @@#define PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_S_SMBUS 0x7a23#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_S_SMBUS 0x7aa3
Quoted 9 lines
drivers/i2c/busses/i2c-i801.c line 240
Quoted 5 lines
drivers/i2c/busses/i2c-i801.c +1
-0#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_P_SMBUS 0x7e22 +#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_S_SMBUS 0xae22#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS 0x8c22#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS 0x8ca2#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS 0x8d22Sorry for nitpicking but since
34b57f40a6a2("i2c: i801: sort IDs alphabetically") this list is supposed to be sorted by ID.
Ah, true. Will fix and resend.