aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Jarzmik <robert.jarzmik@free.fr>2016-04-10 15:29:58 -0400
committerRobert Jarzmik <robert.jarzmik@free.fr>2016-08-09 02:16:58 -0400
commitca5be4c678a402b7a35b2ce9a1a480b79d53f36e (patch)
tree337e3677470d2b75cd65c2ac6deb1b57c4de5d2e
parent1761b1076a6465158079fdb61edcd75143887937 (diff)
ARM: pxa: prepare pxa25x interrupts for device-tree platforms
Add the device-tree interrupts initialization function required to have a generic pxa25x device-tree machine. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
-rw-r--r--arch/arm/mach-pxa/generic.h1
-rw-r--r--arch/arm/mach-pxa/pxa25x.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h
index 0b1dbb54871a..3f914d97cac2 100644
--- a/arch/arm/mach-pxa/generic.h
+++ b/arch/arm/mach-pxa/generic.h
@@ -27,6 +27,7 @@ extern void pxa_timer_init(void);
27 27
28#define pxa25x_handle_irq icip_handle_irq 28#define pxa25x_handle_irq icip_handle_irq
29extern int __init pxa25x_clocks_init(void); 29extern int __init pxa25x_clocks_init(void);
30extern void __init pxa25x_dt_init_irq(void);
30extern void __init pxa25x_init_irq(void); 31extern void __init pxa25x_init_irq(void);
31extern void __init pxa25x_map_io(void); 32extern void __init pxa25x_map_io(void);
32extern void __init pxa26x_init_irq(void); 33extern void __init pxa26x_init_irq(void);
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index ec986524863b..3aa7acab2ccd 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -151,6 +151,12 @@ void __init pxa26x_init_irq(void)
151} 151}
152#endif 152#endif
153 153
154void __init pxa25x_dt_init_irq(void)
155{
156 if (IS_ENABLED(CONFIG_OF))
157 pxa_dt_irq_init(pxa25x_set_wake);
158}
159
154static struct map_desc pxa25x_io_desc[] __initdata = { 160static struct map_desc pxa25x_io_desc[] __initdata = {
155 { /* Mem Ctl */ 161 { /* Mem Ctl */
156 .virtual = (unsigned long)SMEMC_VIRT, 162 .virtual = (unsigned long)SMEMC_VIRT,