summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAmy Wiles <amy.l.wiles@intel.com>2015-10-14 08:09:15 -0700
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-10-16 22:30:48 +0200
commit89e7b2553ae182a4b2a19e2e99a59ad0d3ccb1ed (patch)
treea0af3267a5a42363de0ac3b00d555da8719b8365 /drivers
parent25cb62b76430a91cc6195f902e61c2cb84ade622 (diff)
downloadlinux-89e7b2553ae182a4b2a19e2e99a59ad0d3ccb1ed.tar.bz2
powercap / RAPL: Enable Broxton RAPL support
Broxton CPU ID for the RAPL driver. Signed-off-by: Amy Wiles <amy.l.wiles@intel.com> [ rjw: Subject and changelog. ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/powercap/intel_rapl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index 5efacd050c7d..cc97f0869791 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1102,6 +1102,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
RAPL_CPU(0x4A, rapl_defaults_tng),/* Tangier */
RAPL_CPU(0x56, rapl_defaults_core),/* Future Xeon */
RAPL_CPU(0x5A, rapl_defaults_ann),/* Annidale */
+ RAPL_CPU(0X5C, rapl_defaults_core),/* Broxton */
RAPL_CPU(0x5E, rapl_defaults_core),/* Skylake-H/S */
RAPL_CPU(0x57, rapl_defaults_hsw_server),/* Knights Landing */
{}