diff options
| author | Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com> | 2019-02-01 13:02:25 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-08 07:22:58 +0200 |
| commit | 2f86122bd369e11ebdc4136a56bda0f5484e9b0d (patch) | |
| tree | 3e18558c3137561fd6d6468c76ad38a974bd3df9 | |
| parent | 7a7b0c0ee92fa305b445102e9457884c04d02e31 (diff) | |
| download | linux-stable-2f86122bd369e11ebdc4136a56bda0f5484e9b0d.tar.gz linux-stable-2f86122bd369e11ebdc4136a56bda0f5484e9b0d.tar.bz2 linux-stable-2f86122bd369e11ebdc4136a56bda0f5484e9b0d.zip | |
platform/x86: intel_pmc_core: Handle CFL regmap properly
commit e50af8332785355de3cb40d9f5e8c45dbfc86f53 upstream.
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: 661405bd817b ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/platform/x86/intel_pmc_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c index af6f7aece2e7..e88e183914af 100644 --- a/drivers/platform/x86/intel_pmc_core.c +++ b/drivers/platform/x86/intel_pmc_core.c @@ -802,7 +802,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)) |