| Message ID | 20210114143811.1820137-1-jarkko.nikula@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | d1f50bcfd646b620bef0e0ccb9b7523ad14fef63 |
| Headers | show |
| Series | i2c: i801: Add support for Intel Alder Lake PCH-P | expand |
On Thu, Jan 14, 2021 at 04:38:11PM +0200, Jarkko Nikula wrote: > Add PCI ID of SMBus controller on Intel Alder Lake PCH-P. > > Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Do we still update Documentation/i2c/busses/i2c-i801.rst? And maybe we should add Jarkko as i801 maintainer because Jean is usually fine with such changes? > --- > drivers/i2c/busses/i2c-i801.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c > index 4435e5fdc75e..b931b629b457 100644 > --- a/drivers/i2c/busses/i2c-i801.c > +++ b/drivers/i2c/busses/i2c-i801.c > @@ -73,6 +73,7 @@ > * Jasper Lake (SOC) 0x4da3 32 hard yes yes yes > * Comet Lake-V (PCH) 0xa3a3 32 hard yes yes yes > * Alder Lake-S (PCH) 0x7aa3 32 hard yes yes yes > + * Alder Lake-P (PCH) 0x51a3 32 hard yes yes yes > * > * Features supported by this driver: > * Software PEC no > @@ -230,6 +231,7 @@ > #define PCI_DEVICE_ID_INTEL_TIGERLAKE_H_SMBUS 0x43a3 > #define PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS 0x4b23 > #define PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS 0x4da3 > +#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_P_SMBUS 0x51a3 > #define PCI_DEVICE_ID_INTEL_BROXTON_SMBUS 0x5ad4 > #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_S_SMBUS 0x7aa3 > #define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS 0x8c22 > @@ -1087,6 +1089,7 @@ static const struct pci_device_id i801_ids[] = { > { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TIGERLAKE_H_SMBUS) }, > { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS) }, > { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ALDER_LAKE_S_SMBUS) }, > + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ALDER_LAKE_P_SMBUS) }, > { 0, } > }; > > @@ -1776,6 +1779,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) > case PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS: > case PCI_DEVICE_ID_INTEL_EBG_SMBUS: > case PCI_DEVICE_ID_INTEL_ALDER_LAKE_S_SMBUS: > + case PCI_DEVICE_ID_INTEL_ALDER_LAKE_P_SMBUS: > priv->features |= FEATURE_BLOCK_PROC; > priv->features |= FEATURE_I2C_BLOCK_READ; > priv->features |= FEATURE_IRQ; > -- > 2.29.2 >
On 1/28/21 10:59 AM, Wolfram Sang wrote: > On Thu, Jan 14, 2021 at 04:38:11PM +0200, Jarkko Nikula wrote: >> Add PCI ID of SMBus controller on Intel Alder Lake PCH-P. >> >> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> > > Do we still update Documentation/i2c/busses/i2c-i801.rst? > Actually need to avoid patching it and Kconfig for each new chipset variant and make them shorter was my motivation behind commit 80d943ab19e9 ("i2c: i801: Consolidate chipset names in documentation and Kconfig"). Here Alder Lake name was added by the commit 332fdaebb64e ("i2c: i801: Add support for Intel Alder Lake PCH-S"). > And maybe we should add Jarkko as i801 maintainer because Jean is usually > fine with such changes? > I'm not sure am I up to the task? Meaning I don't feel I know it so well. I've been mostly adding new PCI IDs to new platforms. Jarkko
> Actually need to avoid patching it and Kconfig for each new chipset variant > and make them shorter was my motivation behind commit 80d943ab19e9 ("i2c: > i801: Consolidate chipset names in documentation and Kconfig"). OK, I'll try to remember next time ;) > > And maybe we should add Jarkko as i801 maintainer because Jean is usually > > fine with such changes? > > > I'm not sure am I up to the task? Meaning I don't feel I know it so well. > I've been mostly adding new PCI IDs to new platforms. OK, I was just asking. Jean seems to be MIA, so: Applied to for-next, thanks!
On Tue, 9 Feb 2021 11:45:17 +0100, Wolfram Sang wrote: > > Actually need to avoid patching it and Kconfig for each new chipset variant > > and make them shorter was my motivation behind commit 80d943ab19e9 ("i2c: > > i801: Consolidate chipset names in documentation and Kconfig"). > > OK, I'll try to remember next time ;) > > > > And maybe we should add Jarkko as i801 maintainer because Jean is usually > > > fine with such changes? > > > > > I'm not sure am I up to the task? Meaning I don't feel I know it so well. > > I've been mostly adding new PCI IDs to new platforms. > > OK, I was just asking. Jean seems to be MIA, so: > > Applied to for-next, thanks! Sorry, I somehow missed this thread. Looks all good to me, thanks Jarkko and Wolfram. Reviewed-by: Jean Delvare <jdelvare@suse.de> -- Jean Delvare SUSE L3 Support
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 4435e5fdc75e..b931b629b457 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -73,6 +73,7 @@ * Jasper Lake (SOC) 0x4da3 32 hard yes yes yes * Comet Lake-V (PCH) 0xa3a3 32 hard yes yes yes * Alder Lake-S (PCH) 0x7aa3 32 hard yes yes yes + * Alder Lake-P (PCH) 0x51a3 32 hard yes yes yes * * Features supported by this driver: * Software PEC no @@ -230,6 +231,7 @@ #define PCI_DEVICE_ID_INTEL_TIGERLAKE_H_SMBUS 0x43a3 #define PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS 0x4b23 #define PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS 0x4da3 +#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_P_SMBUS 0x51a3 #define PCI_DEVICE_ID_INTEL_BROXTON_SMBUS 0x5ad4 #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_S_SMBUS 0x7aa3 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS 0x8c22 @@ -1087,6 +1089,7 @@ static const struct pci_device_id i801_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TIGERLAKE_H_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ALDER_LAKE_S_SMBUS) }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ALDER_LAKE_P_SMBUS) }, { 0, } }; @@ -1776,6 +1779,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) case PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS: case PCI_DEVICE_ID_INTEL_EBG_SMBUS: case PCI_DEVICE_ID_INTEL_ALDER_LAKE_S_SMBUS: + case PCI_DEVICE_ID_INTEL_ALDER_LAKE_P_SMBUS: priv->features |= FEATURE_BLOCK_PROC; priv->features |= FEATURE_I2C_BLOCK_READ; priv->features |= FEATURE_IRQ;
Add PCI ID of SMBus controller on Intel Alder Lake PCH-P. Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> --- drivers/i2c/busses/i2c-i801.c | 4 ++++ 1 file changed, 4 insertions(+)