diff options
author | David Cohen <david.a.cohen@linux.intel.com> | 2013-12-16 15:07:38 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-15 17:38:58 -0500 |
commit | bc20aa48bbb3068224a1c91f8332971fdb689fad (patch) | |
tree | f1a4b0e72b921027c590e56d215638c402b625b3 /arch/x86/include/asm/intel-mid.h | |
parent | 85611e3febe78955a519f5f9eb47b941525c8c76 (diff) |
x86, intel-mid: Add Merrifield platform support
This code was partially based on Mark Brown's previous work.
Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
Link: http://lkml.kernel.org/r/1387224459-25746-4-git-send-email-david.a.cohen@linux.intel.com
Signed-off-by: Fei Yang <fei.yang@intel.com>
Cc: Mark F. Brown <mark.f.brown@intel.com>
Cc: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/intel-mid.h')
-rw-r--r-- | arch/x86/include/asm/intel-mid.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/intel-mid.h b/arch/x86/include/asm/intel-mid.h index f8a831431fe0..e34e097b6f9d 100644 --- a/arch/x86/include/asm/intel-mid.h +++ b/arch/x86/include/asm/intel-mid.h | |||
@@ -52,6 +52,7 @@ enum intel_mid_cpu_type { | |||
52 | /* 1 was Moorestown */ | 52 | /* 1 was Moorestown */ |
53 | INTEL_MID_CPU_CHIP_PENWELL = 2, | 53 | INTEL_MID_CPU_CHIP_PENWELL = 2, |
54 | INTEL_MID_CPU_CHIP_CLOVERVIEW, | 54 | INTEL_MID_CPU_CHIP_CLOVERVIEW, |
55 | INTEL_MID_CPU_CHIP_TANGIER, | ||
55 | }; | 56 | }; |
56 | 57 | ||
57 | extern enum intel_mid_cpu_type __intel_mid_cpu_chip; | 58 | extern enum intel_mid_cpu_type __intel_mid_cpu_chip; |
@@ -82,6 +83,7 @@ struct intel_mid_ops { | |||
82 | #define INTEL_MID_OPS_INIT {\ | 83 | #define INTEL_MID_OPS_INIT {\ |
83 | DECLARE_INTEL_MID_OPS_INIT(penwell, INTEL_MID_CPU_CHIP_PENWELL), \ | 84 | DECLARE_INTEL_MID_OPS_INIT(penwell, INTEL_MID_CPU_CHIP_PENWELL), \ |
84 | DECLARE_INTEL_MID_OPS_INIT(cloverview, INTEL_MID_CPU_CHIP_CLOVERVIEW), \ | 85 | DECLARE_INTEL_MID_OPS_INIT(cloverview, INTEL_MID_CPU_CHIP_CLOVERVIEW), \ |
86 | DECLARE_INTEL_MID_OPS_INIT(tangier, INTEL_MID_CPU_CHIP_TANGIER) \ | ||
85 | }; | 87 | }; |
86 | 88 | ||
87 | #ifdef CONFIG_X86_INTEL_MID | 89 | #ifdef CONFIG_X86_INTEL_MID |