Commit e50af833 authored Feb 01, 2019 by Rajneesh Bhardwaj Committed by Andy Shevchenko Feb 05, 2019

platform/x86: intel_pmc_core: Handle CFL regmap properly

Only Coffeelake should use Cannonlake regmap other than Cannonlake
platform. This allows Coffeelake special handling only when there is no
matching PCI device and default reg map selected as per CPUID is for
Sunrisepoint PCH. This change is needed to enable support for newer SoCs
such as Icelake.

Cc: "David E. Box" <david.e.box@intel.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Fixes: 661405bd ("platform/x86: intel_pmc_core: Special case for Coffeelake")
Acked-by: "David E. Box" <david.e.box@linux.intel.com>
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

parent 871f1f2b

drivers/platform/x86/intel_pmc_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -768,7 +768,7 @@ static int __init pmc_core_probe(void)
		* Sunrisepoint PCH regmap can't be used. Use Cannonlake PCH regmap
		* in this case.
		*/
		if (!pci_dev_present(pmc_pci_ids))
		if (pmcdev->map == &spt_reg_map && !pci_dev_present(pmc_pci_ids))
		pmcdev->map = &cnp_reg_map;

		if (lpit_read_residency_count_address(&slp_s0_addr))

Admin message