| Message ID | 20200213065539.3476310-2-vicamo.yang@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | intel_pch_thermal: Add Comet Lake (CML) platform support | expand |
Clean cherry-pick.
Acked-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
On 13.02.20 07:55, You-Sheng Yang wrote: > From: Gayatri Kammela <gayatri.kammela@intel.com> > > BugLink: https://bugs.launchpad.net/bugs/1853219 > > Add Comet Lake to the list of the platforms to support intel_pch_thermal > driver. > > Cc: Zhang rui <rui.zhang@intel.com> > Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com> > Acked-by: Zhang Rui <rui.zhang@intel.com> > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > Link: https://lore.kernel.org/r/20191211200043.4985-1-gayatri.kammela@intel.com > (cherry picked from commit 35709c4ee772afc3818cd6d42d123d608feeaa33) > Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com> Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > 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); >
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);