From 42ab5304547b1d40909eeb499b5f38b99410e597 Mon Sep 17 00:00:00 2001 From: Jamie Iles Date: Tue, 27 Sep 2011 20:25:51 +0100 Subject: ARM: nomadik: convert to MULTI_IRQ_HANDLER Now that there is a generic IRQ handler for multiple VIC devices use it for nomadik to help building multi platform kernels. Cc: Alessandro Rubini Acked-by: Linus Walleij Cc: STEricsson Tested-by: Thomas Abraham Signed-off-by: Jamie Iles --- arch/arm/mach-nomadik/board-nhk8815.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-nomadik/board-nhk8815.c') diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index 0cbb74c96ef7..f98259c050ee 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -280,6 +281,7 @@ MACHINE_START(NOMADIK, "NHK8815") .atag_offset = 0x100, .map_io = cpu8815_map_io, .init_irq = cpu8815_init_irq, + .handle_irq = vic_handle_irq, .timer = &nomadik_timer, .init_machine = nhk8815_platform_init, MACHINE_END -- cgit v1.2.2 From 61b3875382bc335423ccd7cbf2736c70175a54dd Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 28 Nov 2011 12:20:53 +0100 Subject: ARM: 7179/1: nomadik: localize cpu-8815 header The symbols from cpu-8815.c were being broadcast across the entire kernel but are only really used locally in mach-nomadik so let's localize them. Signed-off-by: Linus Walleij Signed-off-by: Russell King --- arch/arm/mach-nomadik/board-nhk8815.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-nomadik/board-nhk8815.c') diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index 0cbb74c96ef7..4518050c8e8a 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c @@ -34,6 +34,8 @@ #include #include +#include "cpu-8815.h" + /* Initial value for SRC control register: all timers use MXTAL/8 source */ #define SRC_CR_INIT_MASK 0x00007fff #define SRC_CR_INIT_VAL 0x2aaa8000 -- cgit v1.2.2 From 35b47a405db2b26ce4e541e7add02e792b04f1fe Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 28 Nov 2011 10:48:02 +0000 Subject: ARM: restart: nomadik: use new restart hook Hook the Nomadik NHK platform restart code into the new restart hook. Signed-off-by: Russell King --- arch/arm/mach-nomadik/board-nhk8815.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-nomadik/board-nhk8815.c') diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index 4518050c8e8a..68c7b79bad79 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c @@ -284,4 +284,5 @@ MACHINE_START(NOMADIK, "NHK8815") .init_irq = cpu8815_init_irq, .timer = &nomadik_timer, .init_machine = nhk8815_platform_init, + .restart = cpu8815_restart, MACHINE_END -- cgit v1.2.2