From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1425749AbcFHORr (ORCPT ); Wed, 8 Jun 2016 10:17:47 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33792 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422831AbcFHORp (ORCPT ); Wed, 8 Jun 2016 10:17:45 -0400 Date: Wed, 8 Jun 2016 07:16:01 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: brgerst@gmail.com, mingo@kernel.org, rjw@rjwysocki.net, tglx@linutronix.de, lenb@kernel.org, dave.hansen@linux.intel.com, torvalds@linux-foundation.org, dvlasenk@redhat.com, bp@alien8.de, peterz@infradead.org, linux-kernel@vger.kernel.org, luto@amacapital.net, hpa@zytor.com, dave@sr71.net Reply-To: dave.hansen@linux.intel.com, bp@alien8.de, torvalds@linux-foundation.org, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, luto@amacapital.net, peterz@infradead.org, dave@sr71.net, hpa@zytor.com, brgerst@gmail.com, mingo@kernel.org, rjw@rjwysocki.net, lenb@kernel.org, tglx@linutronix.de In-Reply-To: <20160603001946.264CE704@viggo.jf.intel.com> References: <20160603001946.264CE704@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cpu] x86/acpi/lss: Use Intel family name macros for the acpi_lpss driver Git-Commit-ID: 4626d840a1e0044e6f23d226ea8a5b96bd167636 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: 4626d840a1e0044e6f23d226ea8a5b96bd167636 Gitweb: http://git.kernel.org/tip/4626d840a1e0044e6f23d226ea8a5b96bd167636 Author: Dave Hansen AuthorDate: Thu, 2 Jun 2016 17:19:46 -0700 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 13:03:26 +0200 x86/acpi/lss: Use Intel family name macros for the acpi_lpss driver Another straightforward replacement of magic numbers. Signed-off-by: Dave Hansen Acked-by: Rafael J. Wysocki Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Len Brown Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: jacob.jun.pan@intel.com Cc: linux-acpi@vger.kernel.org Link: http://lkml.kernel.org/r/20160603001946.264CE704@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- drivers/acpi/acpi_lpss.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c index 0872d5f..357a0b8 100644 --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/acpi_lpss.c @@ -29,6 +29,7 @@ ACPI_MODULE_NAME("acpi_lpss"); #ifdef CONFIG_X86_INTEL_LPSS #include +#include #include #include @@ -229,8 +230,8 @@ static const struct lpss_device_desc bsw_spi_dev_desc = { #define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } static const struct x86_cpu_id lpss_cpu_ids[] = { - ICPU(0x37), /* Valleyview, Bay Trail */ - ICPU(0x4c), /* Braswell, Cherry Trail */ + ICPU(INTEL_FAM6_ATOM_SILVERMONT1), /* Valleyview, Bay Trail */ + ICPU(INTEL_FAM6_ATOM_AIRMONT), /* Braswell, Cherry Trail */ {} };