diff options
| author | popcornmix <popcornmix@gmail.com> | 2019-05-21 14:11:57 +0100 |
|---|---|---|
| committer | popcornmix <popcornmix@gmail.com> | 2019-05-21 14:11:57 +0100 |
| commit | 2b1a992899f708567f69c052ae2768c215b22d5d (patch) | |
| tree | fb776d19600624e5a78bc19b3ce0209e88480cdc /drivers/cpufreq | |
| parent | 33b883a459e2cf59f0d84a9148b269ab6a07bbf3 (diff) | |
| parent | dafc674bbcb11c6a5c63b75be5873b118e2add17 (diff) | |
| download | linux-rpi3-2b1a992899f708567f69c052ae2768c215b22d5d.tar.gz linux-rpi3-2b1a992899f708567f69c052ae2768c215b22d5d.tar.bz2 linux-rpi3-2b1a992899f708567f69c052ae2768c215b22d5d.zip | |
Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index a005711f909e..29f25d5d65e0 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -1779,7 +1779,7 @@ static const struct pstate_funcs knl_funcs = { static const struct x86_cpu_id intel_pstate_cpu_ids[] = { ICPU(INTEL_FAM6_SANDYBRIDGE, core_funcs), ICPU(INTEL_FAM6_SANDYBRIDGE_X, core_funcs), - ICPU(INTEL_FAM6_ATOM_SILVERMONT1, silvermont_funcs), + ICPU(INTEL_FAM6_ATOM_SILVERMONT, silvermont_funcs), ICPU(INTEL_FAM6_IVYBRIDGE, core_funcs), ICPU(INTEL_FAM6_HASWELL_CORE, core_funcs), ICPU(INTEL_FAM6_BROADWELL_CORE, core_funcs), @@ -1796,7 +1796,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = { ICPU(INTEL_FAM6_XEON_PHI_KNL, knl_funcs), ICPU(INTEL_FAM6_XEON_PHI_KNM, knl_funcs), ICPU(INTEL_FAM6_ATOM_GOLDMONT, core_funcs), - ICPU(INTEL_FAM6_ATOM_GEMINI_LAKE, core_funcs), + ICPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS, core_funcs), ICPU(INTEL_FAM6_SKYLAKE_X, core_funcs), {} }; |