Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1417478

[tip:x86/cpu] x86/acpi/lss: Use Intel family name macros for the acpi_lpss driver

From tip-bot for Dave Hansen <tipbot@zytor.com>
Newsgroups linux.kernel
Subject [tip:x86/cpu] x86/acpi/lss: Use Intel family name macros for the acpi_lpss driver
Date 2016-06-08 16:20 +0200
Message-ID <rHMuS-1eQ-3@gated-at.bofh.it> (permalink)
References <rFL9T-4xF-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Commit-ID:  4626d840a1e0044e6f23d226ea8a5b96bd167636
Gitweb:     http://git.kernel.org/tip/4626d840a1e0044e6f23d226ea8a5b96bd167636
Author:     Dave Hansen <dave.hansen@linux.intel.com>
AuthorDate: Thu, 2 Jun 2016 17:19:46 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
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 <dave.hansen@linux.intel.com>
Acked-by: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Hansen <dave@sr71.net>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
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 <mingo@kernel.org>
---
 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 <asm/cpu_device_id.h>
+#include <asm/intel-family.h>
 #include <asm/iosf_mbi.h>
 #include <asm/pmc_atom.h>
 
@@ -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 */
 	{}
 };
 

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 01/20] [v2] x86, intel: Introduce macros for Intel family numbers Dave Hansen <dave@sr71.net> - 2016-06-03 02:20 +0200
  [PATCH 03/20] x86, rapl: use Intel family macros for rapl Dave Hansen <dave@sr71.net> - 2016-06-03 02:20 +0200
    [tip:perf/core] perf/x86/rapl: Use Intel family macros for RAPL tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 13:10 +0200
  [PATCH 06/20] x86, msr: add missing Intel models Dave Hansen <dave@sr71.net> - 2016-06-03 02:20 +0200
    [tip:perf/core] perf/x86/msr: Add missing Intel models tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 13:10 +0200
  [PATCH 04/20] x86, intel_idle: use Intel family macros for intel_idle Dave Hansen <dave@sr71.net> - 2016-06-03 02:20 +0200
    [tip:x86/cpu] x86/intel_idle: Use Intel family macros for  intel_idle tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 16:20 +0200
  [PATCH 12/20] x86, edac: use Intel family name macros for edac driver Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
  [PATCH 14/20] x86, acpi, lss: use Intel family name macros for lpss driver Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:x86/cpu] x86/acpi/lss: Use Intel family name macros for the  acpi_lpss driver tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 16:20 +0200
  [PATCH 17/20] x86, mmc: use Intel family name macros for mmc driver Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:x86/cpu] x86, mmc: Use Intel family name macros for mmc driver tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 16:20 +0200
  [PATCH 07/20] x86, intel: use Intel model macros intead of open-coding Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:x86/cpu] x86, powercap, rapl: Use Intel model macros intead of  open-coding tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 16:20 +0200
  [PATCH 20/20] x86, powercap, rapl: add Skylake Server model number Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:x86/cpu] x86, powercap, rapl: Add Skylake Server model number tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 16:20 +0200
  [PATCH 11/20] x86, uncore: use Intel family name macros for uncore Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:perf/core] perf/x86/uncore: Use Intel family name macros for  uncore tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 13:10 +0200
  [PATCH 02/20] x86, perf: use Intel family macros for core perf events Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:perf/core] perf/x86/intel: Use Intel family macros for core  perf events tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 13:10 +0200
      Re: [tip:perf/core] perf/x86/intel: Use Intel family macros for core  perf events Vince Weaver <vincent.weaver@maine.edu> - 2016-06-08 16:10 +0200
        Re: [tip:perf/core] perf/x86/intel: Use Intel family macros for core  perf events Borislav Petkov <bp@alien8.de> - 2016-06-08 16:20 +0200
        Re: [tip:perf/core] perf/x86/intel: Use Intel family macros for core  perf events Ingo Molnar <mingo@kernel.org> - 2016-06-08 18:30 +0200
          Re: [tip:perf/core] perf/x86/intel: Use Intel family macros for core  perf events Borislav Petkov <bp@alien8.de> - 2016-06-08 18:40 +0200
            Re: [tip:perf/core] perf/x86/intel: Use Intel family macros for core  perf events Stephane Eranian <eranian@google.com> - 2016-06-08 22:00 +0200
            Re: [tip:perf/core] perf/x86/intel: Use Intel family macros for core  perf events Vince Weaver <vincent.weaver@maine.edu> - 2016-06-08 22:20 +0200
              Re: [tip:perf/core] perf/x86/intel: Use Intel family macros for core  perf events Borislav Petkov <bp@alien8.de> - 2016-06-08 22:50 +0200
  [PATCH 08/20] x86, rapl: reorder cpu detection table Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:x86/cpu] x86, powercap, rapl: Reorder CPU detection table tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 16:20 +0200
  [PATCH 05/20] x86, msr: use Intel family macros for msr events code Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:perf/core] perf/x86/msr: Use Intel family macros for MSR  events code tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 13:10 +0200
  [PATCH 10/20] x86, cstate: use Intel Model name macros Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:perf/core] perf/x86/cstate: Use Intel Model name macros tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 13:10 +0200
  [PATCH 09/20] x86, platform: use new Intel model number macros Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:x86/cpu] x86/platform: Use new Intel model number macros tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 16:20 +0200
  [PATCH 13/20] x86, cpufreq: use Intel family name macros for intel_pstate cpufreq driver Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:x86/cpu] x86/cpufreq: Use Intel family name macros for the  intel_pstate cpufreq driver tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 16:20 +0200
  [PATCH 16/20] x86, pmc_core: use Intel family name macros for pmc_core driver Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:perf/core] x86/pmc_core: Use Intel family name macros for  pmc_core driver tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 16:20 +0200
  [PATCH 19/20] x86, rapl: add Skylake server model detection Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:perf/core] perf/x86/rapl: Add Skylake server model detection tip-bot for Jacob Pan <tipbot@zytor.com> - 2016-06-08 13:10 +0200
      Re: [tip:perf/core] perf/x86/rapl: Add Skylake server model  detection Vince Weaver <vincent.weaver@maine.edu> - 2016-06-08 16:20 +0200
        Re: [tip:perf/core] perf/x86/rapl: Add Skylake server model  detection Jacob Pan <jacob.jun.pan@linux.intel.com> - 2016-06-10 14:40 +0200
          Re: [tip:perf/core] perf/x86/rapl: Add Skylake server model detection Dave Hansen <dave@sr71.net> - 2016-06-10 17:50 +0200
  [PATCH 18/20] x86, thermal: clean up and fix cpu model detection for intel_soc_dts_thermal Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:x86/cpu] x86, thermal: Clean up and fix CPU model detection  for intel_soc_dts_thermal tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 16:20 +0200
  [PATCH 15/20] x86, intel_telemetry: use Intel family name macros for telemetry driver Dave Hansen <dave@sr71.net> - 2016-06-03 02:30 +0200
    [tip:x86/cpu] x86/intel_telemetry: Use Intel family name macros for  telemetry driver tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 16:20 +0200
  Re: [PATCH 01/20] [v2] x86, intel: Introduce macros for Intel family numbers "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-06-03 02:40 +0200
  [tip:x86/urgent] x86/cpu/intel: Introduce macros for Intel family  numbers tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 12:00 +0200
  [tip:x86/urgent] x86/cpu/intel: Introduce macros for Intel family  numbers tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-06-08 12:10 +0200
  Re: [PATCH 01/20] [v2] x86, intel: Introduce macros for Intel family  numbers Ingo Molnar <mingo@kernel.org> - 2016-06-08 13:10 +0200

csiph-web