Merge drm/drm-next into drm-intel-next-queued

[linux-2.6-microblaze.git] / drivers / powercap / intel_rapl_common.c

diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index 94ddd7d..a67701e 100644 (file)
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -978,6 +978,8 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
        INTEL_CPU_FAM6(ICELAKE_NNPI, rapl_defaults_core),
        INTEL_CPU_FAM6(ICELAKE_X, rapl_defaults_hsw_server),
        INTEL_CPU_FAM6(ICELAKE_D, rapl_defaults_hsw_server),
+       INTEL_CPU_FAM6(COMETLAKE_L, rapl_defaults_core),
+       INTEL_CPU_FAM6(COMETLAKE, rapl_defaults_core),
 
        INTEL_CPU_FAM6(ATOM_SILVERMONT, rapl_defaults_byt),
        INTEL_CPU_FAM6(ATOM_AIRMONT, rapl_defaults_cht),