[PATCH 15/20] x86, intel_telemetry: use Intel family name macros for telemetry driver

From: Dave Hansen
Date: Wed Jun 01 2016 - 20:13:58 EST



From: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>

Another straightforward replacement of magic numbers.

Signed-off-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: Souvik Kumar Chakravarty <souvik.k.chakravarty@xxxxxxxxx>
Cc: Darren Hart <dvhart@xxxxxxxxxxxxx>
Cc: platform-driver-x86@xxxxxxxxxxxxxxx
---

b/drivers/platform/x86/intel_telemetry_debugfs.c | 3 ++-
b/drivers/platform/x86/intel_telemetry_pltdrv.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)

diff -puN drivers/platform/x86/intel_telemetry_debugfs.c~x86-intel-families-telemetry drivers/platform/x86/intel_telemetry_debugfs.c
--- a/drivers/platform/x86/intel_telemetry_debugfs.c~x86-intel-families-telemetry 2016-06-01 15:45:08.962162099 -0700
+++ b/drivers/platform/x86/intel_telemetry_debugfs.c 2016-06-01 15:45:08.967162327 -0700
@@ -32,6 +32,7 @@
#include <linux/suspend.h>

#include <asm/cpu_device_id.h>
+#include <asm/intel-family.h>
#include <asm/intel_pmc_ipc.h>
#include <asm/intel_punit_ipc.h>
#include <asm/intel_telemetry.h>
@@ -331,7 +332,7 @@ static struct telemetry_debugfs_conf tel
};

static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = {
- TELEM_DEBUGFS_CPU(0x5c, telem_apl_debugfs_conf),
+ TELEM_DEBUGFS_CPU(INTEL_FAM6_MODEL_ATOM_GOLDMONT, telem_apl_debugfs_conf),
{}
};

diff -puN drivers/platform/x86/intel_telemetry_pltdrv.c~x86-intel-families-telemetry drivers/platform/x86/intel_telemetry_pltdrv.c
--- a/drivers/platform/x86/intel_telemetry_pltdrv.c~x86-intel-families-telemetry 2016-06-01 15:45:08.964162191 -0700
+++ b/drivers/platform/x86/intel_telemetry_pltdrv.c 2016-06-01 15:45:08.968162373 -0700
@@ -28,6 +28,7 @@
#include <linux/platform_device.h>

#include <asm/cpu_device_id.h>
+#include <asm/intel-family.h>
#include <asm/intel_pmc_ipc.h>
#include <asm/intel_punit_ipc.h>
#include <asm/intel_telemetry.h>
@@ -163,7 +164,7 @@ static struct telemetry_plt_config telem
};

static const struct x86_cpu_id telemetry_cpu_ids[] = {
- TELEM_CPU(0x5c, telem_apl_config),
+ TELEM_CPU(INTEL_FAM6_MODEL_ATOM_GOLDMONT, telem_apl_config),
{}
};

_