Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 14070ade02cc378bc30dae383532768a94805988

Authored by Arnd Bergmann
1 parent 1fe4061864
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches 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

ARM: at91: fix new build errors 

MULTI_IRQ_HANDLER and SPARSE_IRQ are now required everywhere because
mach/irqs.h and mach/entry-macros.S are gone but the symbols are
only selected for AT91SAM9, not for the NOMMU parts.

A few files now need to include linux/io.h directly, which used to
be included through other headers that have changed.

The new at91_aic_irq_priorities variable is only used with CONFIG_OF
enabled and should not be visible otherwise.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Showing 4 changed files with 8 additions and 1 deletions Side-by-side Diff

arch/arm/mach-at91/Kconfig
Diff comments   View file @ 14070ad
... ... @@ -37,6 +37,8 @@
37 37 config SOC_AT91RM9200
38 38 bool "AT91RM9200"
39 39 select CPU_ARM920T
  40 + select MULTI_IRQ_HANDLER
  41 + select SPARSE_IRQ
40 42 select GENERIC_CLOCKEVENTS
41 43 select HAVE_AT91_DBGU0
42 44  
... ... @@ -142,6 +144,8 @@
142 144 config ARCH_AT91X40
143 145 bool "AT91x40"
144 146 depends on !MMU
  147 + select MULTI_IRQ_HANDLER
  148 + select SPARSE_IRQ
145 149 select ARCH_USES_GETTIMEOFFSET
146 150  
147 151 endchoice
arch/arm/mach-at91/at91x40.c
Diff comments   View file @ 14070ad
... ... @@ -13,6 +13,7 @@
13 13 #include <linux/kernel.h>
14 14 #include <linux/init.h>
15 15 #include <linux/irq.h>
  16 +#include <linux/io.h>
16 17 #include <asm/proc-fns.h>
17 18 #include <asm/system_misc.h>
18 19 #include <asm/mach/arch.h>
arch/arm/mach-at91/irq.c
Diff comments   View file @ 14070ad
... ... @@ -49,7 +49,6 @@
49 49 static struct device_node *at91_aic_np;
50 50 static unsigned int n_irqs = NR_AIC_IRQS;
51 51 static unsigned long at91_aic_caps = 0;
52   -static unsigned int *at91_aic_irq_priorities;
53 52  
54 53 /* AIC5 introduces a Source Select Register */
55 54 #define AT91_AIC_CAP_AIC5 (1 << 0)
... ... @@ -359,6 +358,8 @@
359 358 }
360 359  
361 360 #if defined(CONFIG_OF)
  361 +static unsigned int *at91_aic_irq_priorities;
  362 +
362 363 static int at91_aic_irq_map(struct irq_domain *h, unsigned int virq,
363 364 irq_hw_number_t hw)
364 365 {
drivers/rtc/rtc-at91rm9200.c
Diff comments   View file @ 14070ad
... ... @@ -27,6 +27,7 @@
27 27 #include <linux/interrupt.h>
28 28 #include <linux/ioctl.h>
29 29 #include <linux/completion.h>
  30 +#include <linux/io.h>
30 31  
31 32 #include <asm/uaccess.h>
32 33