From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1425661AbcFHOQQ (ORCPT ); Wed, 8 Jun 2016 10:16:16 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33680 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161480AbcFHOQP (ORCPT ); Wed, 8 Jun 2016 10:16:15 -0400 Date: Wed, 8 Jun 2016 07:15:09 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: bp@alien8.de, dave.hansen@linux.intel.com, brgerst@gmail.com, peterz@infradead.org, jacob.jun.pan@linux.intel.com, luto@amacapital.net, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, srinivas.pandruvada@linux.intel.com, torvalds@linux-foundation.org, mingo@kernel.org, dave@sr71.net, tglx@linutronix.de, rafael.j.wysocki@intel.com Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, luto@amacapital.net, jacob.jun.pan@linux.intel.com, peterz@infradead.org, dave.hansen@linux.intel.com, brgerst@gmail.com, bp@alien8.de, rafael.j.wysocki@intel.com, dave@sr71.net, tglx@linutronix.de, mingo@kernel.org, torvalds@linux-foundation.org, srinivas.pandruvada@linux.intel.com In-Reply-To: <20160603001939.D1D7FC2F@viggo.jf.intel.com> References: <20160603001939.D1D7FC2F@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cpu] x86/platform: Use new Intel model number macros Git-Commit-ID: d5e0c89a8ccde900c3245474915ea0f518abdb79 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d5e0c89a8ccde900c3245474915ea0f518abdb79 Gitweb: http://git.kernel.org/tip/d5e0c89a8ccde900c3245474915ea0f518abdb79 Author: Dave Hansen AuthorDate: Thu, 2 Jun 2016 17:19:39 -0700 Committer: Ingo Molnar 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 Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Jacob Pan Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Rafael J. Wysocki Cc: Srinivas Pandruvada Cc: Thomas Gleixner Cc: jacob.jun.pan@intel.com Link: http://lkml.kernel.org/r/20160603001939.D1D7FC2F@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- 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 #include #include +#include #include /* 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), {} };