From: Radivoje Jovanovic <radivoje.jovanovic@intel.com>
Date: Fri, 31 Jul 2015 15:07:10 +0000 (-0700)
Subject: powercap / RAPL: Add support for Skylake H/S
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2cac1f700c2c6baf836f24c778a73a847a48f484;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

powercap / RAPL: Add support for Skylake H/S

This patche enabled RAPL to support Intel Skylake H/S

Signed-off-by: Radivoje Jovanovic <radivoje.jovanovic@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index 482b22ddc7b2..bca9620b5d38 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1101,6 +1101,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(0x5E, rapl_defaults_core),/* Skylake-H/S */
 	RAPL_CPU(0x57, rapl_defaults_hsw_server),/* Knights Landing */
 	{}
 };