Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git] / drivers / powercap / intel_rapl.c
index bb92874b1175ecc5f129c56c19a911f6d206ef0e..6cdb2c14eee4c33db1ec24e3fcfebe62a03b9a5d 100644 (file)
@@ -1157,13 +1157,13 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
        INTEL_CPU_FAM6(KABYLAKE_DESKTOP,        rapl_defaults_core),
        INTEL_CPU_FAM6(CANNONLAKE_MOBILE,       rapl_defaults_core),
 
-       INTEL_CPU_FAM6(ATOM_SILVERMONT1,        rapl_defaults_byt),
+       INTEL_CPU_FAM6(ATOM_SILVERMONT        rapl_defaults_byt),
        INTEL_CPU_FAM6(ATOM_AIRMONT,            rapl_defaults_cht),
-       INTEL_CPU_FAM6(ATOM_MERRIFIELD,         rapl_defaults_tng),
-       INTEL_CPU_FAM6(ATOM_MOOREFIELD,         rapl_defaults_ann),
+       INTEL_CPU_FAM6(ATOM_SILVERMONT_MID,     rapl_defaults_tng),
+       INTEL_CPU_FAM6(ATOM_AIRMONT_MID,        rapl_defaults_ann),
        INTEL_CPU_FAM6(ATOM_GOLDMONT,           rapl_defaults_core),
-       INTEL_CPU_FAM6(ATOM_GEMINI_LAKE,        rapl_defaults_core),
-       INTEL_CPU_FAM6(ATOM_DENVERTON,          rapl_defaults_core),
+       INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS,      rapl_defaults_core),
+       INTEL_CPU_FAM6(ATOM_GOLDMONT_X,         rapl_defaults_core),
 
        INTEL_CPU_FAM6(XEON_PHI_KNL,            rapl_defaults_hsw_server),
        INTEL_CPU_FAM6(XEON_PHI_KNM,            rapl_defaults_hsw_server),