aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2016-06-15 08:04:20 -0400
committerIngo Molnar <mingo@kernel.org>2016-07-10 11:22:31 -0400
commit06a3fcc44d98d6b05afeeae2fbb32938dc3233c7 (patch)
tree7dd1e68b9953e94080527a9653ec0fb6010389fe
parenta11836fa5a67ba56d8338138e37b42384af73e5e (diff)
x86/platform/intel-mid: Make vertical indentation consistent
The vertical indentation is kinda chaotic in intel-mid.h. Let's be consistent with it. Suggested-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1465992260-29897-1-git-send-email-andriy.shevchenko@linux.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/include/asm/intel-mid.h65
1 files changed, 34 insertions, 31 deletions
diff --git a/arch/x86/include/asm/intel-mid.h b/arch/x86/include/asm/intel-mid.h
index 38498a4fb44f..59013a2ac713 100644
--- a/arch/x86/include/asm/intel-mid.h
+++ b/arch/x86/include/asm/intel-mid.h
@@ -42,11 +42,11 @@ struct devs_id {
42 void *(*get_platform_data)(void *info); 42 void *(*get_platform_data)(void *info);
43 /* Custom handler for devices */ 43 /* Custom handler for devices */
44 void (*device_handler)(struct sfi_device_table_entry *pentry, 44 void (*device_handler)(struct sfi_device_table_entry *pentry,
45 struct devs_id *dev); 45 struct devs_id *dev);
46}; 46};
47 47
48#define sfi_device(i) \ 48#define sfi_device(i) \
49 static const struct devs_id *const __intel_mid_sfi_##i##_dev __used \ 49 static const struct devs_id *const __intel_mid_sfi_##i##_dev __used \
50 __attribute__((__section__(".x86_intel_mid_dev.init"))) = &i 50 __attribute__((__section__(".x86_intel_mid_dev.init"))) = &i
51 51
52/* 52/*
@@ -68,7 +68,7 @@ extern enum intel_mid_cpu_type __intel_mid_cpu_chip;
68/** 68/**
69 * struct intel_mid_ops - Interface between intel-mid & sub archs 69 * struct intel_mid_ops - Interface between intel-mid & sub archs
70 * @arch_setup: arch_setup function to re-initialize platform 70 * @arch_setup: arch_setup function to re-initialize platform
71 * structures (x86_init, x86_platform_init) 71 * structures (x86_init, x86_platform_init)
72 * 72 *
73 * This structure can be extended if any new interface is required 73 * This structure can be extended if any new interface is required
74 * between intel-mid & its sub arch files. 74 * between intel-mid & its sub arch files.
@@ -78,20 +78,20 @@ struct intel_mid_ops {
78}; 78};
79 79
80/* Helper API's for INTEL_MID_OPS_INIT */ 80/* Helper API's for INTEL_MID_OPS_INIT */
81#define DECLARE_INTEL_MID_OPS_INIT(cpuname, cpuid) \ 81#define DECLARE_INTEL_MID_OPS_INIT(cpuname, cpuid) \
82 [cpuid] = get_##cpuname##_ops 82 [cpuid] = get_##cpuname##_ops
83 83
84/* Maximum number of CPU ops */ 84/* Maximum number of CPU ops */
85#define MAX_CPU_OPS(a) (sizeof(a)/sizeof(void *)) 85#define MAX_CPU_OPS(a) (sizeof(a)/sizeof(void *))
86 86
87/* 87/*
88 * For every new cpu addition, a weak get_<cpuname>_ops() function needs be 88 * For every new cpu addition, a weak get_<cpuname>_ops() function needs be
89 * declared in arch/x86/platform/intel_mid/intel_mid_weak_decls.h. 89 * declared in arch/x86/platform/intel_mid/intel_mid_weak_decls.h.
90 */ 90 */
91#define INTEL_MID_OPS_INIT {\ 91#define INTEL_MID_OPS_INIT { \
92 DECLARE_INTEL_MID_OPS_INIT(penwell, INTEL_MID_CPU_CHIP_PENWELL), \ 92 DECLARE_INTEL_MID_OPS_INIT(penwell, INTEL_MID_CPU_CHIP_PENWELL), \
93 DECLARE_INTEL_MID_OPS_INIT(cloverview, INTEL_MID_CPU_CHIP_CLOVERVIEW), \ 93 DECLARE_INTEL_MID_OPS_INIT(cloverview, INTEL_MID_CPU_CHIP_CLOVERVIEW), \
94 DECLARE_INTEL_MID_OPS_INIT(tangier, INTEL_MID_CPU_CHIP_TANGIER) \ 94 DECLARE_INTEL_MID_OPS_INIT(tangier, INTEL_MID_CPU_CHIP_TANGIER) \
95}; 95};
96 96
97#ifdef CONFIG_X86_INTEL_MID 97#ifdef CONFIG_X86_INTEL_MID
@@ -108,8 +108,8 @@ static inline bool intel_mid_has_msic(void)
108 108
109#else /* !CONFIG_X86_INTEL_MID */ 109#else /* !CONFIG_X86_INTEL_MID */
110 110
111#define intel_mid_identify_cpu() (0) 111#define intel_mid_identify_cpu() 0
112#define intel_mid_has_msic() (0) 112#define intel_mid_has_msic() 0
113 113
114#endif /* !CONFIG_X86_INTEL_MID */ 114#endif /* !CONFIG_X86_INTEL_MID */
115 115
@@ -125,35 +125,38 @@ extern enum intel_mid_timer_options intel_mid_timer_options;
125 * Penwell uses spread spectrum clock, so the freq number is not exactly 125 * Penwell uses spread spectrum clock, so the freq number is not exactly
126 * the same as reported by MSR based on SDM. 126 * the same as reported by MSR based on SDM.
127 */ 127 */
128#define FSB_FREQ_83SKU 83200 128#define FSB_FREQ_83SKU 83200
129#define FSB_FREQ_100SKU 99840 129#define FSB_FREQ_100SKU 99840
130#define FSB_FREQ_133SKU 133000 130#define FSB_FREQ_133SKU 133000
131 131
132#define FSB_FREQ_167SKU 167000 132#define FSB_FREQ_167SKU 167000
133#define FSB_FREQ_200SKU 200000 133#define FSB_FREQ_200SKU 200000
134#define FSB_FREQ_267SKU 267000 134#define FSB_FREQ_267SKU 267000
135#define FSB_FREQ_333SKU 333000 135#define FSB_FREQ_333SKU 333000
136#define FSB_FREQ_400SKU 400000 136#define FSB_FREQ_400SKU 400000
137 137
138/* Bus Select SoC Fuse value */ 138/* Bus Select SoC Fuse value */
139#define BSEL_SOC_FUSE_MASK 0x7 139#define BSEL_SOC_FUSE_MASK 0x7
140#define BSEL_SOC_FUSE_001 0x1 /* FSB 133MHz */ 140/* FSB 133MHz */
141#define BSEL_SOC_FUSE_101 0x5 /* FSB 100MHz */ 141#define BSEL_SOC_FUSE_001 0x1
142#define BSEL_SOC_FUSE_111 0x7 /* FSB 83MHz */ 142/* FSB 100MHz */
143#define BSEL_SOC_FUSE_101 0x5
144/* FSB 83MHz */
145#define BSEL_SOC_FUSE_111 0x7
143 146
144#define SFI_MTMR_MAX_NUM 8 147#define SFI_MTMR_MAX_NUM 8
145#define SFI_MRTC_MAX 8 148#define SFI_MRTC_MAX 8
146 149
147extern void intel_scu_devices_create(void); 150extern void intel_scu_devices_create(void);
148extern void intel_scu_devices_destroy(void); 151extern void intel_scu_devices_destroy(void);
149 152
150/* VRTC timer */ 153/* VRTC timer */
151#define MRST_VRTC_MAP_SZ (1024) 154#define MRST_VRTC_MAP_SZ 1024
152/*#define MRST_VRTC_PGOFFSET (0xc00) */ 155/* #define MRST_VRTC_PGOFFSET 0xc00 */
153 156
154extern void intel_mid_rtc_init(void); 157extern void intel_mid_rtc_init(void);
155 158
156/* the offset for the mapping of global gpio pin to irq */ 159/* The offset for the mapping of global gpio pin to irq */
157#define INTEL_MID_IRQ_OFFSET 0x100 160#define INTEL_MID_IRQ_OFFSET 0x100
158 161
159#endif /* _ASM_X86_INTEL_MID_H */ 162#endif /* _ASM_X86_INTEL_MID_H */