Skip to contentSkip to conversation

mfd: intel-lpss: Add Intel Comet Lake PCI IDs

PATCH Superseded Andy Shevchenko 4 participants 5 messages Apr 9, 2019 – Apr 30, 2019

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Andy Shevchenko

author reviewer
#0 lore raw

PATCH 1/1 mfd: intel-lpss: Add Intel Comet Lake PCI IDs

Intel Comet Lake has the same LPSS than Intel Cannon Lake. Add the new IDs to the list of supported devices.

---
 drivers/mfd/intel-lpss-pci.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
drivers/mfd/intel-lpss-pci.c +13 -0
index a67f67c90ec4..50a907f93da9 100644
@@ -129,6 +129,19 @@ static const struct intel_lpss_platform_info cnl_i2c_info = {
 };
 
 static const struct pci_device_id intel_lpss_pci_ids[] = {
+	/* CML */
+	{ PCI_VDEVICE(INTEL, 0x02a8), (kernel_ulong_t)&spt_uart_info },
+	{ PCI_VDEVICE(INTEL, 0x02a9), (kernel_ulong_t)&spt_uart_info },
+	{ PCI_VDEVICE(INTEL, 0x02aa), (kernel_ulong_t)&spt_info },
+	{ PCI_VDEVICE(INTEL, 0x02ab), (kernel_ulong_t)&spt_info },
+	{ PCI_VDEVICE(INTEL, 0x02c5), (kernel_ulong_t)&bxt_i2c_info },
+	{ PCI_VDEVICE(INTEL, 0x02c6), (kernel_ulong_t)&bxt_i2c_info },
+	{ PCI_VDEVICE(INTEL, 0x02c7), (kernel_ulong_t)&spt_uart_info },
+	{ PCI_VDEVICE(INTEL, 0x02e8), (kernel_ulong_t)&bxt_i2c_info },
+	{ PCI_VDEVICE(INTEL, 0x02e9), (kernel_ulong_t)&bxt_i2c_info },
+	{ PCI_VDEVICE(INTEL, 0x02ea), (kernel_ulong_t)&bxt_i2c_info },
+	{ PCI_VDEVICE(INTEL, 0x02eb), (kernel_ulong_t)&bxt_i2c_info },
+	{ PCI_VDEVICE(INTEL, 0x02fb), (kernel_ulong_t)&spt_info },
 	/* BXT A-Step */
 	{ PCI_VDEVICE(INTEL, 0x0aac), (kernel_ulong_t)&bxt_i2c_info },
 	{ PCI_VDEVICE(INTEL, 0x0aae), (kernel_ulong_t)&bxt_i2c_info },
Signature · 1 line
2.20.1
#1 lore raw
Quoted 22 lines · Andy Shevchenko

Intel Comet Lake has the same LPSS than Intel Cannon Lake. Add the new IDs to the list of supported devices.

---
  drivers/mfd/intel-lpss-pci.c | 13 +++++++++++++
  1 file changed, 13 insertions(+)
drivers/mfd/intel-lpss-pci.c +6 -0
index a67f67c90ec4..50a907f93da9 100644
@@ -129,6 +129,19 @@ static const struct intel_lpss_platform_info cnl_i2c_info = {
  };
 
  static const struct pci_device_id intel_lpss_pci_ids[] = {
+	/* CML */
+	{ PCI_VDEVICE(INTEL, 0x02a8), (kernel_ulong_t)&spt_uart_info },
+	{ PCI_VDEVICE(INTEL, 0x02a9), (kernel_ulong_t)&spt_uart_info },
+	{ PCI_VDEVICE(INTEL, 0x02aa), (kernel_ulong_t)&spt_info },
+	{ PCI_VDEVICE(INTEL, 0x02ab), (kernel_ulong_t)&spt_info },
+	{ PCI_VDEVICE(INTEL, 0x02c5), (kernel_ulong_t)&bxt_i2c_info },

drivers/mfd/intel-lpss-pci.c static const struct intel_lpss_platform_info cnl_i2c_info = { · line 147

Quoted 10 lines
drivers/mfd/intel-lpss-pci.c +7 -0
+	{ PCI_VDEVICE(INTEL, 0x02c6), (kernel_ulong_t)&bxt_i2c_info },
+	{ PCI_VDEVICE(INTEL, 0x02c7), (kernel_ulong_t)&spt_uart_info },
+	{ PCI_VDEVICE(INTEL, 0x02e8), (kernel_ulong_t)&bxt_i2c_info },
+	{ PCI_VDEVICE(INTEL, 0x02e9), (kernel_ulong_t)&bxt_i2c_info },
+	{ PCI_VDEVICE(INTEL, 0x02ea), (kernel_ulong_t)&bxt_i2c_info },
+	{ PCI_VDEVICE(INTEL, 0x02eb), (kernel_ulong_t)&bxt_i2c_info },
+	{ PCI_VDEVICE(INTEL, 0x02fb), (kernel_ulong_t)&spt_info },
  	/* BXT A-Step */
  	{ PCI_VDEVICE(INTEL, 0x0aac), (kernel_ulong_t)&bxt_i2c_info },
  	{ PCI_VDEVICE(INTEL, 0x0aae), (kernel_ulong_t)&bxt_i2c_info },

Let's hold a bit. I'd like to double check does the I2C controller use Skylake or Broxton derived input clocks.

Signature · 1 line
Jarkko
#2 lore raw
In reply to Andy Shevchenko
Quoted 14 lines · Andy Shevchenko

Intel Comet Lake has the same LPSS than Intel Cannon Lake. Add the new IDs to the list of supported devices.

---
 drivers/mfd/intel-lpss-pci.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
drivers/mfd/intel-lpss-pci.c +0 -0
index a67f67c90ec4..50a907f93da9 100644

drivers/mfd/intel-lpss-pci.c static const struct intel_lpss_platform_info cnl_i2c_info = { · line 138

Quoted 10 lines
drivers/mfd/intel-lpss-pci.c +7 -0
@@ -129,6 +129,19 @@ static const struct intel_lpss_platform_info cnl_i2c_info = {
 };
 
 static const struct pci_device_id intel_lpss_pci_ids[] = {
+       /* CML */
+       { PCI_VDEVICE(INTEL, 0x02a8), (kernel_ulong_t)&spt_uart_info },
+       { PCI_VDEVICE(INTEL, 0x02a9), (kernel_ulong_t)&spt_uart_info },
+       { PCI_VDEVICE(INTEL, 0x02aa), (kernel_ulong_t)&spt_info },
+       { PCI_VDEVICE(INTEL, 0x02ab), (kernel_ulong_t)&spt_info },
+       { PCI_VDEVICE(INTEL, 0x02c5), (kernel_ulong_t)&bxt_i2c_info },
+       { PCI_VDEVICE(INTEL, 0x02c6), (kernel_ulong_t)&bxt_i2c_info },

How come it's not cnl_i2c_info?

#3 lore raw
Quoted 15 lines · Evan Green

drivers/mfd/intel-lpss-pci.c static const struct intel_lpss_platform_info cnl_i2c_info = { · line 138

Quoted 12 lines · Andy Shevchenko

Intel Comet Lake has the same LPSS than Intel Cannon Lake. Add the new IDs to the list of supported devices.

static const struct pci_device_id intel_lpss_pci_ids[] = {

drivers/mfd/intel-lpss-pci.c +7 -0
+       /* CML */
+       { PCI_VDEVICE(INTEL, 0x02a8), (kernel_ulong_t)&spt_uart_info },
+       { PCI_VDEVICE(INTEL, 0x02a9), (kernel_ulong_t)&spt_uart_info },
+       { PCI_VDEVICE(INTEL, 0x02aa), (kernel_ulong_t)&spt_info },
+       { PCI_VDEVICE(INTEL, 0x02ab), (kernel_ulong_t)&spt_info },
+       { PCI_VDEVICE(INTEL, 0x02c5), (kernel_ulong_t)&bxt_i2c_info },
+       { PCI_VDEVICE(INTEL, 0x02c6), (kernel_ulong_t)&bxt_i2c_info },
Quoted 1 line

How come it's not cnl_i2c_info?

This is a good question, that's why Jarkko asked Lee to hold on until we have confirmation about i2c timings.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#4 lore raw
Quoted 16 lines · Andy Shevchenko
Quoted 15 lines · Evan Green
Quoted 12 lines · Andy Shevchenko

Intel Comet Lake has the same LPSS than Intel Cannon Lake. Add the new IDs to the list of supported devices.

  static const struct pci_device_id intel_lpss_pci_ids[] = {
drivers/mfd/intel-lpss-pci.c +7 -0
+       /* CML */
+       { PCI_VDEVICE(INTEL, 0x02a8), (kernel_ulong_t)&spt_uart_info },
+       { PCI_VDEVICE(INTEL, 0x02a9), (kernel_ulong_t)&spt_uart_info },
+       { PCI_VDEVICE(INTEL, 0x02aa), (kernel_ulong_t)&spt_info },
+       { PCI_VDEVICE(INTEL, 0x02ab), (kernel_ulong_t)&spt_info },
+       { PCI_VDEVICE(INTEL, 0x02c5), (kernel_ulong_t)&bxt_i2c_info },
+       { PCI_VDEVICE(INTEL, 0x02c6), (kernel_ulong_t)&bxt_i2c_info },
Quoted 5 lines
Quoted 1 line

How come it's not cnl_i2c_info?

This is a good question, that's why Jarkko asked Lee to hold on until we have confirmation about i2c timings.

I got confirmation I2C uses the same input clock than Cannon Lake and matches with my measurements.

Andy: please do s/bxt_i2c_info/cnl_i2c_info/ in your patch.

Signature · 1 line
Jarkko