From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753506AbcFCAXB (ORCPT ); Thu, 2 Jun 2016 20:23:01 -0400 Received: from mga03.intel.com ([134.134.136.65]:27887 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752465AbcFCATk (ORCPT ); Thu, 2 Jun 2016 20:19:40 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,409,1459839600"; d="scan'208";a="979861932" Subject: [PATCH 09/20] x86, platform: use new Intel model number macros To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, jacob.jun.pan@intel.com, Dave Hansen , dave.hansen@linux.intel.com, jacob.jun.pan@linux.intel.com, rafael.j.wysocki@intel.com, srinivas.pandruvada@linux.intel.com From: Dave Hansen Date: Thu, 02 Jun 2016 17:19:39 -0700 References: <20160603001927.F2A7D828@viggo.jf.intel.com> In-Reply-To: <20160603001927.F2A7D828@viggo.jf.intel.com> Message-Id: <20160603001939.D1D7FC2F@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen Remove the open-coded model numbers. Signed-off-by: Dave Hansen Cc: Jacob Pan Cc: "Rafael J. Wysocki" Cc: Srinivas Pandruvada --- b/arch/x86/include/asm/intel-family.h | 4 ++-- b/arch/x86/platform/atom/punit_atom_debug.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff -puN arch/x86/include/asm/intel-family.h~x86-intel-familites-punit arch/x86/include/asm/intel-family.h --- a/arch/x86/include/asm/intel-family.h~x86-intel-familites-punit 2016-06-02 17:10:30.027247326 -0700 +++ b/arch/x86/include/asm/intel-family.h 2016-06-02 17:10:49.390122378 -0700 @@ -53,9 +53,9 @@ #define INTEL_FAM6_ATOM_PENWELL 0x27 #define INTEL_FAM6_ATOM_CLOVERVIEW 0x35 #define INTEL_FAM6_ATOM_CEDARVIEW 0x36 -#define INTEL_FAM6_ATOM_SILVERMONT1 0x37 /* BayTrail/BYT */ +#define INTEL_FAM6_ATOM_SILVERMONT1 0x37 /* BayTrail/BYT / Valleyview */ #define INTEL_FAM6_ATOM_SILVERMONT2 0x4D /* Avaton/Rangely */ -#define INTEL_FAM6_ATOM_AIRMONT 0x4C /* CherryTrail */ +#define INTEL_FAM6_ATOM_AIRMONT 0x4C /* CherryTrail / Braswell */ #define INTEL_FAM6_ATOM_MERRIFIELD1 0x4A /* Tangier */ #define INTEL_FAM6_ATOM_MERRIFIELD2 0x5A /* Annidale */ #define INTEL_FAM6_ATOM_GOLDMONT 0x5C diff -puN arch/x86/platform/atom/punit_atom_debug.c~x86-intel-familites-punit arch/x86/platform/atom/punit_atom_debug.c --- a/arch/x86/platform/atom/punit_atom_debug.c~x86-intel-familites-punit 2016-06-02 17:10:30.029247416 -0700 +++ b/arch/x86/platform/atom/punit_atom_debug.c 2016-06-02 17:10:30.034247642 -0700 @@ -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), {} }; _