i2c: i801: Enlarge device name field in i801_ids table
Subsystems (3)
PATCH v3 1/3 i2c: i801: Enlarge device name field in i801_ids table
Indent data field in the i801_ids table by one tab to make more space for longer device names.
--- drivers/i2c/busses/i2c-i801.c | 122 +++++++++++++++++----------------- 1 file changed, 61 insertions(+), 61 deletions(-)
drivers/i2c/busses/i2c-i801.c +61 -61
@@ -977,67 +977,67 @@ static const struct i2c_algorithm smbus_algorithm = { FEATURE_HOST_NOTIFY) static const struct pci_device_id i801_ids[] = { - { PCI_DEVICE_DATA(INTEL, 82801AA_3, 0) }, - { PCI_DEVICE_DATA(INTEL, 82801AB_3, 0) }, - { PCI_DEVICE_DATA(INTEL, 82801BA_2, 0) }, - { PCI_DEVICE_DATA(INTEL, 82801CA_3, FEATURE_HOST_NOTIFY) }, - { PCI_DEVICE_DATA(INTEL, 82801DB_3, FEATURES_ICH4) }, - { PCI_DEVICE_DATA(INTEL, 82801EB_3, FEATURES_ICH5) }, - {PCI_DEVICE_DATA (INTEL ,ESB_4 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ICH6_16 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ICH7_17 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ESB2_17 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ICH8_5 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ICH9_6 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,EP80579_1 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ICH10_4 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ICH10_5 ,FEATURES_ICH5 ) }, - { PCI_DEVICE_DATA(INTEL, 5_3400_SERIES_SMBUS, FEATURES_ICH5) }, - {PCI_DEVICE_DATA (INTEL ,COUGARPOINT_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF0 ,FEATURES_ICH5 |FEATURE_IDF ) }, - {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF1 ,FEATURES_ICH5 |FEATURE_IDF ) }, - {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF2 ,FEATURES_ICH5 |FEATURE_IDF ) }, - {PCI_DEVICE_DATA (INTEL ,DH89XXCC_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,PANTHERPOINT_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,LYNXPOINT_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,LYNXPOINT_LP_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,AVOTON_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS0 ,FEATURES_ICH5 |FEATURE_IDF ) }, - {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS1 ,FEATURES_ICH5 |FEATURE_IDF ) }, - {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS2 ,FEATURES_ICH5 |FEATURE_IDF ) }, - {PCI_DEVICE_DATA (INTEL ,COLETOCREEK_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,GEMINILAKE_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,WILDCATPOINT_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,WILDCATPOINT_LP_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,BAYTRAIL_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,BRASWELL_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,SUNRISEPOINT_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,SUNRISEPOINT_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,CDF_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,DNV_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,EBG_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,BROXTON_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,LEWISBURG_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,LEWISBURG_SSKU_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,KABYLAKE_PCH_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,CANNONLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,CANNONLAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,ICELAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,ICELAKE_N_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,COMETLAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,COMETLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,COMETLAKE_V_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,ELKHART_LAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,TIGERLAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,TIGERLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,JASPER_LAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,ALDER_LAKE_S_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,ALDER_LAKE_P_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {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, 82801AA_3, 0) }, + { PCI_DEVICE_DATA(INTEL, 82801AB_3, 0) }, + { PCI_DEVICE_DATA(INTEL, 82801BA_2, 0) }, + { PCI_DEVICE_DATA(INTEL, 82801CA_3, FEATURE_HOST_NOTIFY) }, + { PCI_DEVICE_DATA(INTEL, 82801DB_3, FEATURES_ICH4) }, + { PCI_DEVICE_DATA(INTEL, 82801EB_3, FEATURES_ICH5) }, + {PCI_DEVICE_DATA (INTEL ,ESB_4 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH6_16 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH7_17 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ESB2_17 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH8_5 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH9_6 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,EP80579_1 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH10_4 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH10_5 ,FEATURES_ICH5 ) }, + { PCI_DEVICE_DATA(INTEL, 5_3400_SERIES_SMBUS, FEATURES_ICH5) }, + {PCI_DEVICE_DATA (INTEL ,COUGARPOINT_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF0 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF1 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF2 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,DH89XXCC_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,PANTHERPOINT_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,LYNXPOINT_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,LYNXPOINT_LP_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,AVOTON_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS0 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS1 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS2 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,COLETOCREEK_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,GEMINILAKE_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,WILDCATPOINT_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,WILDCATPOINT_LP_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,BAYTRAIL_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,BRASWELL_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,SUNRISEPOINT_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,SUNRISEPOINT_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,CDF_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,DNV_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,EBG_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,BROXTON_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,LEWISBURG_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,LEWISBURG_SSKU_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,KABYLAKE_PCH_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,CANNONLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,CANNONLAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,ICELAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,ICELAKE_N_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,COMETLAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,COMETLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,COMETLAKE_V_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,ELKHART_LAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,TIGERLAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,TIGERLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,JASPER_LAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,ALDER_LAKE_S_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,ALDER_LAKE_P_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {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 ) }, {0 , } };
Signature · 1 line
2.39.2
PATCH v3 2/3 i2c: i801: Add support for Intel Meteor Lake SoC-S
Add SMBus PCI ID on Intel Meteor Lake SoC-S South.
---
v3: Call this explicitly as Meteor Lake SoC-S SMBus controller for
distinguish from Meteor Lake PCH-S SMBus controller in patch 3/3.
v2: Keep PCI ID define list sorted and define
PCI_DEVICE_ID_INTEL_METEOR_LAKE_S_SMBUS in correct place.
--- 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 SoC-S (SOC) 0xae22 32 hard yes yes yes * * Features supported by this driver: * Software PEC no
@@ -250,6 +251,7 @@#define PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS 0xa2a3#define PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS 0xa323#define PCI_DEVICE_ID_INTEL_COMETLAKE_V_SMBUS 0xa3a3 +#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_SOC_S_SMBUS 0xae22struct i801_mux_config {char *gpio_chip;
@@ -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_SOC_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, { 0, } };
Signature · 1 line
2.39.2
Re: [PATCH v3 2/3] i2c: i801: Add support for Intel Meteor Lake SoC-S
Hi Jarkko,
Quoted 3 lines · Jarkko Nikula
Add SMBus PCI ID on Intel Meteor Lake SoC-S South.
Signed-off-by Jarkko Nikula <[email protected]>
Andi
Re: [PATCH v3 2/3] i2c: i801: Add support for Intel Meteor Lake SoC-S
In reply to Jarkko NikulaQuoted 33 lines · Jarkko Nikula
Add SMBus PCI ID on Intel Meteor Lake SoC-S South.
Signed-off-by Jarkko Nikula <[email protected]>---
v3: Call this explicitly as Meteor Lake SoC-S SMBus controller for
distinguish from Meteor Lake PCH-S SMBus controller in patch 3/3.
v2: Keep PCI ID define list sorted and define
PCI_DEVICE_ID_INTEL_METEOR_LAKE_S_SMBUSin correct place.--- drivers/i2c/busses/i2c-i801.c | 3 +++ 1 file changed, 3 insertions(+)drivers/i2c/busses/i2c-i801.c +2
-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 SoC-S (SOC) 0xae22 32 hard yes yes yes * * Features supported by this driver: * Software PEC no @@ -250,6 +251,7 @@#define PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS 0xa2a3#define PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS 0xa323#define PCI_DEVICE_ID_INTEL_COMETLAKE_V_SMBUS 0xa3a3 +#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_SOC_S_SMBUS 0xae22struct i801_mux_config {char *gpio_chip;
drivers/i2c/busses/i2c-i801.c static const struct pci_device_id i801_ids[] = { · line 1046
Quoted 7 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_SOC_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, { 0, } };
Signature · 2 lines
Jean Delvare SUSE L3 Support
PATCH v3 3/3 i2c: i801: Add support for Intel Meteor Lake PCH-S
In reply to Jarkko NikulaAdd SMBus PCI ID on Intel Meteor Lake PCH-S.
---
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(-)
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 and 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 and 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 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, } };
Signature · 1 line
2.39.2
Re: [PATCH v3 3/3] i2c: i801: Add support for Intel Meteor Lake PCH-S
Hi Jarkko,
Quoted 3 lines · Jarkko Nikula
Add SMBus PCI ID on Intel Meteor Lake PCH-S.
Signed-off-by Jarkko Nikula <[email protected]>
Andi
Re: [PATCH v3 3/3] i2c: i801: Add support for Intel Meteor Lake PCH-S
In reply to Jarkko NikulaQuoted 65 lines · Jarkko Nikula
Add SMBus PCI ID on Intel Meteor Lake PCH-S.
Signed-off-by Jarkko Nikula <[email protected]>---
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 intoi801_idstable 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 andKconfig. 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(-)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 and PCH) Datasheets: 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 and 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 +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 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
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_SOC_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, + { PCI_DEVICE_DATA(INTEL, METEOR_LAKE_PCH_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, { 0, } };
Signature · 2 lines
Jean Delvare SUSE L3 Support
Hi Jarkko,
Quoted 4 lines · Jarkko Nikula
Indent data field in the
i801_idstable by one tab to make more space for longer device names.Signed-off-by Jarkko Nikula <[email protected]>
Andi
Quoted 131 lines · Jarkko Nikula
Indent data field in the
i801_idstable by one tab to make more space for longer device names.Signed-off-by Jarkko Nikula <[email protected]>--- drivers/i2c/busses/i2c-i801.c | 122 +++++++++++++++++----------------- 1 file changed, 61 insertions(+), 61 deletions(-)drivers/i2c/busses/i2c-i801.c +54
-61@@ -977,67 +977,67 @@ static const struct i2c_algorithm smbus_algorithm = { FEATURE_HOST_NOTIFY) static const struct pci_device_id i801_ids[] = { - { PCI_DEVICE_DATA(INTEL, 82801AA_3, 0) }, - { PCI_DEVICE_DATA(INTEL, 82801AB_3, 0) }, - { PCI_DEVICE_DATA(INTEL, 82801BA_2, 0) }, - { PCI_DEVICE_DATA(INTEL, 82801CA_3, FEATURE_HOST_NOTIFY) }, - { PCI_DEVICE_DATA(INTEL, 82801DB_3, FEATURES_ICH4) }, - { PCI_DEVICE_DATA(INTEL, 82801EB_3, FEATURES_ICH5) }, - {PCI_DEVICE_DATA (INTEL ,ESB_4 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ICH6_16 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ICH7_17 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ESB2_17 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ICH8_5 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ICH9_6 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,EP80579_1 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ICH10_4 ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,ICH10_5 ,FEATURES_ICH5 ) }, - { PCI_DEVICE_DATA(INTEL, 5_3400_SERIES_SMBUS, FEATURES_ICH5) }, - {PCI_DEVICE_DATA (INTEL ,COUGARPOINT_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF0 ,FEATURES_ICH5 |FEATURE_IDF ) }, - {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF1 ,FEATURES_ICH5 |FEATURE_IDF ) }, - {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF2 ,FEATURES_ICH5 |FEATURE_IDF ) }, - {PCI_DEVICE_DATA (INTEL ,DH89XXCC_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,PANTHERPOINT_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,LYNXPOINT_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,LYNXPOINT_LP_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,AVOTON_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS0 ,FEATURES_ICH5 |FEATURE_IDF ) }, - {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS1 ,FEATURES_ICH5 |FEATURE_IDF ) }, - {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS2 ,FEATURES_ICH5 |FEATURE_IDF ) }, - {PCI_DEVICE_DATA (INTEL ,COLETOCREEK_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,GEMINILAKE_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,WILDCATPOINT_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,WILDCATPOINT_LP_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,BAYTRAIL_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,BRASWELL_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,SUNRISEPOINT_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,SUNRISEPOINT_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,CDF_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,DNV_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,EBG_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,BROXTON_SMBUS ,FEATURES_ICH5 ) }, - {PCI_DEVICE_DATA (INTEL ,LEWISBURG_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,LEWISBURG_SSKU_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,KABYLAKE_PCH_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,CANNONLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,CANNONLAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,ICELAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,ICELAKE_N_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,COMETLAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,COMETLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,COMETLAKE_V_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, - {PCI_DEVICE_DATA (INTEL ,ELKHART_LAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,TIGERLAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,TIGERLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,JASPER_LAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,ALDER_LAKE_S_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {PCI_DEVICE_DATA (INTEL ,ALDER_LAKE_P_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, - {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, 82801AA_3, 0) }, + { PCI_DEVICE_DATA(INTEL, 82801AB_3, 0) }, + { PCI_DEVICE_DATA(INTEL, 82801BA_2, 0) }, + { PCI_DEVICE_DATA(INTEL, 82801CA_3, FEATURE_HOST_NOTIFY) }, + { PCI_DEVICE_DATA(INTEL, 82801DB_3, FEATURES_ICH4) }, + { PCI_DEVICE_DATA(INTEL, 82801EB_3, FEATURES_ICH5) }, + {PCI_DEVICE_DATA (INTEL ,ESB_4 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH6_16 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH7_17 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ESB2_17 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH8_5 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH9_6 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,EP80579_1 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH10_4 ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,ICH10_5 ,FEATURES_ICH5 ) }, + { PCI_DEVICE_DATA(INTEL, 5_3400_SERIES_SMBUS, FEATURES_ICH5) }, + {PCI_DEVICE_DATA (INTEL ,COUGARPOINT_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF0 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF1 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,PATSBURG_SMBUS_IDF2 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,DH89XXCC_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,PANTHERPOINT_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,LYNXPOINT_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,LYNXPOINT_LP_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,AVOTON_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS0 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS1 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,WELLSBURG_SMBUS_MS2 ,FEATURES_ICH5 |FEATURE_IDF ) }, + {PCI_DEVICE_DATA (INTEL ,COLETOCREEK_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,GEMINILAKE_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,WILDCATPOINT_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,WILDCATPOINT_LP_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,BAYTRAIL_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,BRASWELL_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,SUNRISEPOINT_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,SUNRISEPOINT_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,CDF_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,DNV_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,EBG_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,BROXTON_SMBUS ,FEATURES_ICH5 ) }, + {PCI_DEVICE_DATA (INTEL ,LEWISBURG_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,LEWISBURG_SSKU_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,KABYLAKE_PCH_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,CANNONLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,CANNONLAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,ICELAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,ICELAKE_N_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,COMETLAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,COMETLAKE_H_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,COMETLAKE_V_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_SPT ) }, + {PCI_DEVICE_DATA (INTEL ,ELKHART_LAKE_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) }, + {PCI_DEVICE_DATA (INTEL ,TIGERLAKE_LP_SMBUS ,FEATURES_ICH5 |FEATURE_TCO_CNL ) },
drivers/i2c/busses/i2c-i801.c static const struct i2c_algorithm smbus_algorithm = { · line 1043
Quoted 10 lines
drivers/i2c/busses/i2c-i801.c +7
-0+ { PCI_DEVICE_DATA(INTEL, TIGERLAKE_H_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, + { PCI_DEVICE_DATA(INTEL, JASPER_LAKE_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, + { PCI_DEVICE_DATA(INTEL, ALDER_LAKE_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, + { PCI_DEVICE_DATA(INTEL, ALDER_LAKE_P_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) }, + { 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) }, { 0, } };
Signature · 2 lines
Jean Delvare SUSE L3 Support