aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Hansen <dave.hansen@linux.intel.com>2016-06-02 20:19:47 -0400
committerIngo Molnar <mingo@kernel.org>2016-06-08 07:03:26 -0400
commit678dec00a4753b74df8ad6fc5167429b614d1139 (patch)
tree7773855a5b340cbd3ae75daeac2c71a10c95e67c
parent4626d840a1e0044e6f23d226ea8a5b96bd167636 (diff)
x86/intel_telemetry: Use Intel family name macros for telemetry driver
Another straightforward replacement of magic numbers. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Acked-by: Darren Hart <dvhart@infradead.org> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Dave Hansen <dave@sr71.net> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: jacob.jun.pan@intel.com Cc: platform-driver-x86@vger.kernel.org Link: http://lkml.kernel.org/r/20160603001947.05102C3E@viggo.jf.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--drivers/platform/x86/intel_telemetry_debugfs.c3
-rw-r--r--drivers/platform/x86/intel_telemetry_pltdrv.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c
index f5134acd6ff0..815a7c5e9566 100644
--- a/drivers/platform/x86/intel_telemetry_debugfs.c
+++ b/drivers/platform/x86/intel_telemetry_debugfs.c
@@ -32,6 +32,7 @@
32#include <linux/suspend.h> 32#include <linux/suspend.h>
33 33
34#include <asm/cpu_device_id.h> 34#include <asm/cpu_device_id.h>
35#include <asm/intel-family.h>
35#include <asm/intel_pmc_ipc.h> 36#include <asm/intel_pmc_ipc.h>
36#include <asm/intel_punit_ipc.h> 37#include <asm/intel_punit_ipc.h>
37#include <asm/intel_telemetry.h> 38#include <asm/intel_telemetry.h>
@@ -331,7 +332,7 @@ static struct telemetry_debugfs_conf telem_apl_debugfs_conf = {
331}; 332};
332 333
333static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = { 334static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = {
334 TELEM_DEBUGFS_CPU(0x5c, telem_apl_debugfs_conf), 335 TELEM_DEBUGFS_CPU(INTEL_FAM6_ATOM_GOLDMONT, telem_apl_debugfs_conf),
335 {} 336 {}
336}; 337};
337 338
diff --git a/drivers/platform/x86/intel_telemetry_pltdrv.c b/drivers/platform/x86/intel_telemetry_pltdrv.c
index 09c84a2b1c2c..6d884f7d1b9f 100644
--- a/drivers/platform/x86/intel_telemetry_pltdrv.c
+++ b/drivers/platform/x86/intel_telemetry_pltdrv.c
@@ -28,6 +28,7 @@
28#include <linux/platform_device.h> 28#include <linux/platform_device.h>
29 29
30#include <asm/cpu_device_id.h> 30#include <asm/cpu_device_id.h>
31#include <asm/intel-family.h>
31#include <asm/intel_pmc_ipc.h> 32#include <asm/intel_pmc_ipc.h>
32#include <asm/intel_punit_ipc.h> 33#include <asm/intel_punit_ipc.h>
33#include <asm/intel_telemetry.h> 34#include <asm/intel_telemetry.h>
@@ -163,7 +164,7 @@ static struct telemetry_plt_config telem_apl_config = {
163}; 164};
164 165
165static const struct x86_cpu_id telemetry_cpu_ids[] = { 166static const struct x86_cpu_id telemetry_cpu_ids[] = {
166 TELEM_CPU(0x5c, telem_apl_config), 167 TELEM_CPU(INTEL_FAM6_ATOM_GOLDMONT, telem_apl_config),
167 {} 168 {}
168}; 169};
169 170