2019-12-11 20:04:48

by Kammela, Gayatri

Subject: [PATCH v1] thermal/intel: intel_pch_thermal: Add Comet Lake (CML) platform support

Add Comet Lake to the list of the platforms to support intel_pch_thermal
driver.

Cc: Zhang rui <[email protected]>
Cc: Srinivas Pandruvada <[email protected]>
Signed-off-by: Gayatri Kammela <[email protected]>
---
drivers/thermal/intel/intel_pch_thermal.c | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/drivers/thermal/intel/intel_pch_thermal.c b/drivers/thermal/intel/intel_pch_thermal.c
index 4f0bb8f502e1..9356f3a7f961 100644
--- a/drivers/thermal/intel/intel_pch_thermal.c
+++ b/drivers/thermal/intel/intel_pch_thermal.c
@@ -23,6 +23,7 @@
#define PCH_THERMAL_DID_SKL_H 0xA131 /* Skylake PCH 100 series */
#define PCH_THERMAL_DID_CNL 0x9Df9 /* CNL PCH */
#define PCH_THERMAL_DID_CNL_H 0xA379 /* CNL-H PCH */
+#define PCH_THERMAL_DID_CML_H 0X06F9 /* CML-H PCH */

/* Wildcat Point-LP PCH Thermal registers */
#define WPT_TEMP 0x0000 /* Temperature */
@@ -272,6 +273,7 @@ enum board_ids {
board_wpt,
board_skl,
board_cnl,
+ board_cml,
};

static const struct board_info {
@@ -294,6 +296,10 @@ static const struct board_info {
.name = "pch_cannonlake",
.ops = &pch_dev_ops_wpt,
},
+ [board_cml] = {
+ .name = "pch_cometlake",
+ .ops = &pch_dev_ops_wpt,
+ }
};

static int intel_pch_thermal_probe(struct pci_dev *pdev,
@@ -398,6 +404,8 @@ static const struct pci_device_id intel_pch_thermal_id[] = {
.driver_data = board_cnl, },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CNL_H),
.driver_data = board_cnl, },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CML_H),
+ .driver_data = board_cml, },
{ 0, },
};
MODULE_DEVICE_TABLE(pci, intel_pch_thermal_id);
--
2.17.1

2020-01-16 07:30:26

by Zhang, Rui

Subject: Re: [PATCH v1] thermal/intel: intel_pch_thermal: Add Comet Lake (CML) platform support

On Wed, 2019-12-11 at 12:00 -0800, Gayatri Kammela wrote:
> Add Comet Lake to the list of the platforms to support
> intel_pch_thermal
> driver.
>
> Cc: Zhang rui <[email protected]>
> Cc: Srinivas Pandruvada <[email protected]>
> Signed-off-by: Gayatri Kammela <[email protected]>

Acked-by: Zhang Rui <[email protected]>

> ---
> drivers/thermal/intel/intel_pch_thermal.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/thermal/intel/intel_pch_thermal.c
> b/drivers/thermal/intel/intel_pch_thermal.c
> index 4f0bb8f502e1..9356f3a7f961 100644
> --- a/drivers/thermal/intel/intel_pch_thermal.c
> +++ b/drivers/thermal/intel/intel_pch_thermal.c
> @@ -23,6 +23,7 @@
> #define PCH_THERMAL_DID_SKL_H 0xA131 /* Skylake PCH 100
> series */
> #define PCH_THERMAL_DID_CNL 0x9Df9 /* CNL PCH */
> #define PCH_THERMAL_DID_CNL_H 0xA379 /* CNL-H PCH */
> +#define PCH_THERMAL_DID_CML_H 0X06F9 /* CML-H PCH */
>
> /* Wildcat Point-LP PCH Thermal registers */
> #define WPT_TEMP 0x0000 /* Temperature */
> @@ -272,6 +273,7 @@ enum board_ids {
> board_wpt,
> board_skl,
> board_cnl,
> + board_cml,
> };
>
> static const struct board_info {
> @@ -294,6 +296,10 @@ static const struct board_info {
> .name = "pch_cannonlake",
> .ops = &pch_dev_ops_wpt,
> },
> + [board_cml] = {
> + .name = "pch_cometlake",
> + .ops = &pch_dev_ops_wpt,
> + }
> };
>
> static int intel_pch_thermal_probe(struct pci_dev *pdev,
> @@ -398,6 +404,8 @@ static const struct pci_device_id
> intel_pch_thermal_id[] = {
> .driver_data = board_cnl, },
> { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CNL_H),
> .driver_data = board_cnl, },
> + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CML_H),
> + .driver_data = board_cml, },
> { 0, },
> };
> MODULE_DEVICE_TABLE(pci, intel_pch_thermal_id);