Commit-ID: d5e0c89a8ccde900c3245474915ea0f518abdb79 Gitweb: http://git.kernel.org/tip/d5e0c89a8ccde900c3245474915ea0f518abdb79 Author: Dave Hansen <dave.han...@linux.intel.com> AuthorDate: Thu, 2 Jun 2016 17:19:39 -0700 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Wed, 8 Jun 2016 13:03:25 +0200
x86/platform: Use new Intel model number macros Remove the open-coded model numbers. Signed-off-by: Dave Hansen <dave.han...@linux.intel.com> Cc: Andy Lutomirski <l...@amacapital.net> Cc: Borislav Petkov <b...@alien8.de> Cc: Brian Gerst <brge...@gmail.com> Cc: Dave Hansen <d...@sr71.net> Cc: Denys Vlasenko <dvlas...@redhat.com> Cc: H. Peter Anvin <h...@zytor.com> Cc: Jacob Pan <jacob.jun....@linux.intel.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Rafael J. Wysocki <rafael.j.wyso...@intel.com> Cc: Srinivas Pandruvada <srinivas.pandruv...@linux.intel.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: jacob.jun....@intel.com Link: http://lkml.kernel.org/r/20160603001939.d1d7f...@viggo.jf.intel.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/x86/platform/atom/punit_atom_debug.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/platform/atom/punit_atom_debug.c b/arch/x86/platform/atom/punit_atom_debug.c index 81c769e..1097829 100644 --- a/arch/x86/platform/atom/punit_atom_debug.c +++ b/arch/x86/platform/atom/punit_atom_debug.c @@ -23,6 +23,7 @@ #include <linux/seq_file.h> #include <linux/io.h> #include <asm/cpu_device_id.h> +#include <asm/intel-family.h> #include <asm/iosf_mbi.h> /* Power gate status reg */ @@ -143,8 +144,8 @@ static void punit_dbgfs_unregister(void) (kernel_ulong_t)&drv_data } static const struct x86_cpu_id intel_punit_cpu_ids[] = { - ICPU(55, punit_device_byt), /* Valleyview, Bay Trail */ - ICPU(76, punit_device_cht), /* Braswell, Cherry Trail */ + ICPU(INTEL_FAM6_ATOM_SILVERMONT1, punit_device_byt), + ICPU(INTEL_FAM6_ATOM_AIRMONT, punit_device_cht), {} };
