Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7a5063d86e95774ada66baac58fdfb7a80c75180

Authored by Russell King
Committed by Russell King
1 parent b8e6c91c74
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ARM] pxa: introduce PXA_HAVE_BOARD_IRQS 

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 2 changed files with 11 additions and 7 deletions Side-by-side Diff

arch/arm/mach-pxa/Kconfig
Diff comments   View file @ 7a5063d
... ... @@ -38,16 +38,19 @@
38 38 bool "Intel DBPXA250 Development Platform"
39 39 select PXA25x
40 40 select SA1111
  41 + select PXA_HAVE_BOARD_IRQS
41 42  
42 43 config MACH_LOGICPD_PXA270
43 44 bool "LogicPD PXA270 Card Engine Development Platform"
44 45 select PXA27x
45 46 select HAVE_PWM
  47 + select PXA_HAVE_BOARD_IRQS
46 48  
47 49 config MACH_MAINSTONE
48 50 bool "Intel HCDDBBVA0 Development Platform"
49 51 select PXA27x
50 52 select HAVE_PWM
  53 + select PXA_HAVE_BOARD_IRQS
51 54  
52 55 config ARCH_PXA_IDP
53 56 bool "Accelent Xscale IDP"
54 57  
... ... @@ -114,10 +117,12 @@
114 117 bool "Enable Sharp SL-6000x (Tosa) Support"
115 118 depends on PXA_SHARPSL
116 119 select PXA25x
  120 + select PXA_HAVE_BOARD_IRQS
117 121  
118 122 config ARCH_PXA_ESERIES
119 123 bool "PXA based Toshiba e-series PDAs"
120 124 select PXA25x
  125 + select PXA_HAVE_BOARD_IRQS
121 126  
122 127 config MACH_E330
123 128 bool "Toshiba e330"
124 129  
... ... @@ -215,12 +220,14 @@
215 220 bool "Enable HTC Magician Support"
216 221 select PXA27x
217 222 select IWMMXT
  223 + select PXA_HAVE_BOARD_IRQS
218 224  
219 225 config MACH_PCM027
220 226 bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
221 227 select PXA27x
222 228 select IWMMXT
223 229 select PXA_SSP
  230 + select PXA_HAVE_BOARD_IRQS
224 231  
225 232 config ARCH_PXA_PALM
226 233 bool "PXA based Palm PDAs"
... ... @@ -342,6 +349,9 @@
342 349 help
343 350 This is a simple driver that is able to control
344 351 the state of built in bluetooth chip on tosa.
  352 +
  353 +config PXA_HAVE_BOARD_IRQS
  354 + bool
345 355  
346 356 endif
arch/arm/mach-pxa/include/mach/irqs.h
Diff comments   View file @ 7a5063d
... ... @@ -178,13 +178,7 @@
178 178 #define NR_IRQS (IRQ_S1_BVD1_STSCHG + 1)
179 179 #elif defined(CONFIG_SHARP_LOCOMO)
180 180 #define NR_IRQS (IRQ_LOCOMO_SPI_TEND + 1)
181   -#elif defined(CONFIG_ARCH_LUBBOCK) || \
182   - defined(CONFIG_MACH_LOGICPD_PXA270) || \
183   - defined(CONFIG_MACH_TOSA) || \
184   - defined(CONFIG_MACH_MAINSTONE) || \
185   - defined(CONFIG_MACH_PCM027) || \
186   - defined(CONFIG_ARCH_PXA_ESERIES) || \
187   - defined(CONFIG_MACH_MAGICIAN)
  181 +#elif defined(CONFIG_PXA_HAVE_BOARD_IRQS)
188 182 #define NR_IRQS (IRQ_BOARD_END)
189 183 #elif defined(CONFIG_MACH_ZYLONITE)
190 184 #define NR_IRQS (IRQ_BOARD_START + 32)