[SRU][B/OEM][PATCH 0/3] New device ID's for Intel Comet Lake

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

[SRU][B/OEM][PATCH 0/3] New device ID's for Intel Comet Lake

Timo Aaltonen-6
BugLink: http://bugs.launchpad.net/bugs/1843774

Add Comet Lake support for subsystems that didn't have it yet.

Adrian Hunter (1):
  mmc: sdhci-pci: Add support for Intel CML

Evan Green (1):
  spi: pxa2xx: Add support for Intel Comet Lake

Jarkko Nikula (1):
  i2c: i801: Add support for Intel Comet Lake

 Documentation/i2c/busses/i2c-i801 | 1 +
 drivers/i2c/busses/Kconfig        | 1 +
 drivers/i2c/busses/i2c-i801.c     | 4 ++++
 drivers/mmc/host/sdhci-pci-core.c | 2 ++
 drivers/mmc/host/sdhci-pci.h      | 2 ++
 drivers/spi/spi-pxa2xx.c          | 4 ++++
 6 files changed, 14 insertions(+)

--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/3] i2c: i801: Add support for Intel Comet Lake

Timo Aaltonen-6
From: Jarkko Nikula <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/1843774

Add PCI ID for Intel Comet Lake PCH.

Signed-off-by: Jarkko Nikula <[hidden email]>
Reviewed-by: Jean Delvare <[hidden email]>
Signed-off-by: Wolfram Sang <[hidden email]>
(backported from commit 5cd1c56c42beb6d228cc8d4373fdc5f5ec78a5ad)
Signed-off-by: Timo Aaltonen <[hidden email]>
---
 Documentation/i2c/busses/i2c-i801 | 1 +
 drivers/i2c/busses/Kconfig        | 1 +
 drivers/i2c/busses/i2c-i801.c     | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801
index d47702456926..87f3c97bf0e5 100644
--- a/Documentation/i2c/busses/i2c-i801
+++ b/Documentation/i2c/busses/i2c-i801
@@ -37,6 +37,7 @@ Supported adapters:
   * Intel Cannon Lake-H (PCH)
   * Intel Cannon Lake-LP (PCH)
   * Intel Cedar Fork (PCH)
+  * Intel Comet Lake (PCH)
    Datasheets: Publicly available at the Intel website
 
 On Intel Patsburg and later chipsets, both the normal host SMBus controller
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 2526c3ff69cb..bd3c846d9214 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -142,6 +142,7 @@ config I2C_I801
     Cannon Lake-H (PCH)
     Cannon Lake-LP (PCH)
     Cedar Fork (PCH)
+    Comet Lake (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 6f9ca9213e02..27ab5e11cfa5 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -69,6 +69,7 @@
  * Cannon Lake-H (PCH) 0xa323 32 hard yes yes yes
  * Cannon Lake-LP (PCH) 0x9da3 32 hard yes yes yes
  * Cedar Fork (PCH) 0x18df 32 hard yes yes yes
+ * Comet Lake (PCH) 0x02a3 32 hard yes yes yes
  *
  * Features supported by this driver:
  * Software PEC no
@@ -237,6 +238,7 @@
 #define PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS 0xa223
 #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_SMBUS 0x02a3
 
 struct i801_mux_config {
  char *gpio_chip;
@@ -1034,6 +1036,7 @@ static const struct pci_device_id i801_ids[] = {
  { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS) },
  { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS) },
  { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_LP_SMBUS) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS) },
  { 0, }
 };
 
@@ -1529,6 +1532,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
  case PCI_DEVICE_ID_INTEL_CDF_SMBUS:
  case PCI_DEVICE_ID_INTEL_DNV_SMBUS:
  case PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS:
+ case PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS:
  priv->features |= FEATURE_I2C_BLOCK_READ;
  priv->features |= FEATURE_IRQ;
  priv->features |= FEATURE_SMBUS_PEC;
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/3] spi: pxa2xx: Add support for Intel Comet Lake

Timo Aaltonen-6
In reply to this post by Timo Aaltonen-6
From: Evan Green <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/1843774

Add PCI IDs for SPI on Comet Lake.

Signed-off-by: Evan Green <[hidden email]>
Acked-by: Andy Shevchenko <[hidden email]>
Reviewed-by: Jarkko Nikula <[hidden email]>
Signed-off-by: Mark Brown <[hidden email]>
(cherry picked from commit 41a918026407be4ca2727cd0d6243fe6cdbfc4ed)
Signed-off-by: Timo Aaltonen <[hidden email]>
---
 drivers/spi/spi-pxa2xx.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 9bf3e5f945c7..fe3b23fc14c1 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1500,6 +1500,10 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = {
  { PCI_VDEVICE(INTEL, 0xa32a), LPSS_CNL_SSP },
  { PCI_VDEVICE(INTEL, 0xa32b), LPSS_CNL_SSP },
  { PCI_VDEVICE(INTEL, 0xa37b), LPSS_CNL_SSP },
+ /* CML-LP */
+ { PCI_VDEVICE(INTEL, 0x02aa), LPSS_CNL_SSP },
+ { PCI_VDEVICE(INTEL, 0x02ab), LPSS_CNL_SSP },
+ { PCI_VDEVICE(INTEL, 0x02fb), LPSS_CNL_SSP },
  { },
 };
 
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 3/3] mmc: sdhci-pci: Add support for Intel CML

Timo Aaltonen-6
In reply to this post by Timo Aaltonen-6
From: Adrian Hunter <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/1843774

Add PCI Ids for Intel CML.

Signed-off-by: Adrian Hunter <[hidden email]>
Signed-off-by: Ulf Hansson <[hidden email]>
(backported from commit 765c59675ab571caf7ada456bbfd23a73136b535)
Signed-off-by: Timo Aaltonen <[hidden email]>
---
 drivers/mmc/host/sdhci-pci-core.c | 2 ++
 drivers/mmc/host/sdhci-pci.h      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index 01b8b650dfd9..04260ac4b13f 100644
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -1346,6 +1346,8 @@ static const struct pci_device_id pci_ids[] = {
  SDHCI_PCI_DEVICE(INTEL, CNP_EMMC,  intel_glk_emmc),
  SDHCI_PCI_DEVICE(INTEL, CNP_SD,    intel_byt_sd),
  SDHCI_PCI_DEVICE(INTEL, CNPH_SD,   intel_byt_sd),
+ SDHCI_PCI_DEVICE(INTEL, CML_EMMC,  intel_glk_emmc),
+ SDHCI_PCI_DEVICE(INTEL, CML_SD,    intel_byt_sd),
  SDHCI_PCI_DEVICE(O2, 8120,     o2),
  SDHCI_PCI_DEVICE(O2, 8220,     o2),
  SDHCI_PCI_DEVICE(O2, 8221,     o2),
diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h
index 0056f08a29cc..21179d5f99e2 100644
--- a/drivers/mmc/host/sdhci-pci.h
+++ b/drivers/mmc/host/sdhci-pci.h
@@ -48,6 +48,8 @@
 #define PCI_DEVICE_ID_INTEL_CNP_EMMC 0x9dc4
 #define PCI_DEVICE_ID_INTEL_CNP_SD 0x9df5
 #define PCI_DEVICE_ID_INTEL_CNPH_SD 0xa375
+#define PCI_DEVICE_ID_INTEL_CML_EMMC 0x02c4
+#define PCI_DEVICE_ID_INTEL_CML_SD 0x02f5
 
 #define PCI_DEVICE_ID_SYSKONNECT_8000 0x8000
 #define PCI_DEVICE_ID_VIA_95D0 0x95d0
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK/cmnt/APPLIED[OEM-B]: [SRU][B/OEM][PATCH 0/3] New device ID's for Intel Comet Lake

AceLan Kao
In reply to this post by Timo Aaltonen-6
Applied on linux-oem (4.15.0-1058.67)
BTW, the third commit has been included from stable tree.

Acked-By: AceLan Kao <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [SRU][B/OEM][PATCH 0/3] New device ID's for Intel Comet Lake

Kleber Souza
In reply to this post by Timo Aaltonen-6
On 10/3/19 8:29 PM, Timo Aaltonen wrote:

> BugLink: http://bugs.launchpad.net/bugs/1843774
>
> Add Comet Lake support for subsystems that didn't have it yet.
>
> Adrian Hunter (1):
>   mmc: sdhci-pci: Add support for Intel CML
>
> Evan Green (1):
>   spi: pxa2xx: Add support for Intel Comet Lake
>
> Jarkko Nikula (1):
>   i2c: i801: Add support for Intel Comet Lake
>
>  Documentation/i2c/busses/i2c-i801 | 1 +
>  drivers/i2c/busses/Kconfig        | 1 +
>  drivers/i2c/busses/i2c-i801.c     | 4 ++++
>  drivers/mmc/host/sdhci-pci-core.c | 2 ++
>  drivers/mmc/host/sdhci-pci.h      | 2 ++
>  drivers/spi/spi-pxa2xx.c          | 4 ++++
>  6 files changed, 14 insertions(+)
>

Acked-by: Kleber Sacilotto de Souza <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED/cmnt: [SRU][B/OEM][PATCH 0/3] New device ID's for Intel Comet Lake

Kleber Souza
In reply to this post by Timo Aaltonen-6
On 10/3/19 8:29 PM, Timo Aaltonen wrote:

> BugLink: http://bugs.launchpad.net/bugs/1843774
>
> Add Comet Lake support for subsystems that didn't have it yet.
>
> Adrian Hunter (1):
>   mmc: sdhci-pci: Add support for Intel CML
>
> Evan Green (1):
>   spi: pxa2xx: Add support for Intel Comet Lake
>
> Jarkko Nikula (1):
>   i2c: i801: Add support for Intel Comet Lake
>
>  Documentation/i2c/busses/i2c-i801 | 1 +
>  drivers/i2c/busses/Kconfig        | 1 +
>  drivers/i2c/busses/i2c-i801.c     | 4 ++++
>  drivers/mmc/host/sdhci-pci-core.c | 2 ++
>  drivers/mmc/host/sdhci-pci.h      | 2 ++
>  drivers/spi/spi-pxa2xx.c          | 4 ++++
>  6 files changed, 14 insertions(+)
>

Applied to bionic/master-next branch. Patch 3/3 has already
been applied as an update to upstream stable.

Thanks,
Kleber

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team