From b6bab1263c61e39cfc3427f54baff6f683f54298 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Tue, 17 Jun 2014 16:47:29 +0900 Subject: ARM: shmobile: Move most of irqs.h, keep some for pinctl Move most of irqs.h so it can be used as #include "irqs.h" instead of the old style #include . Legacy code in drivers/pinctrl needs more work to get rid of the "mach" portion of the include path, so some part is left in the original location. Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven Acked-by: Arnd Bergmann [horms+renesas@verge.net.au: Do not add trailing blank line to irqs.h] Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/board-genmai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-shmobile/board-genmai.c') diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c index c94201ee8596..5ce1025a662b 100644 --- a/arch/arm/mach-shmobile/board-genmai.c +++ b/arch/arm/mach-shmobile/board-genmai.c @@ -26,10 +26,10 @@ #include #include #include -#include #include #include #include +#include "irqs.h" /* Ether */ static const struct sh_eth_plat_data ether_pdata __initconst = { -- cgit v1.2.3 From fd44aa5e570d1d8c7d361dcbf94c2b8cd25cfe92 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Tue, 17 Jun 2014 16:47:37 +0900 Subject: ARM: shmobile: Move common.h Change location for common.h so it can be used as #include "common.h" instead of the old style #include . Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven Acked-by: Arnd Bergmann Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/board-genmai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-shmobile/board-genmai.c') diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c index 5ce1025a662b..f0a8eca7d10d 100644 --- a/arch/arm/mach-shmobile/board-genmai.c +++ b/arch/arm/mach-shmobile/board-genmai.c @@ -25,10 +25,10 @@ #include #include #include -#include #include #include #include +#include "common.h" #include "irqs.h" /* Ether */ -- cgit v1.2.3 From 4387ac5282616ff14edc733aca79fe046ddb45f5 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Fri, 6 Jun 2014 14:28:56 +0900 Subject: ARM: shmobile: Use shmobile_init_delay() on Genmai boards Adjust Genmai board support to use shmobile_init_delay() together with r7s72100 CPU Frequency settings from the DTS. Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/board-genmai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-shmobile/board-genmai.c') diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c index f0a8eca7d10d..a0994f36b348 100644 --- a/arch/arm/mach-shmobile/board-genmai.c +++ b/arch/arm/mach-shmobile/board-genmai.c @@ -154,7 +154,7 @@ static const char * const genmai_boards_compat_dt[] __initconst = { }; DT_MACHINE_START(GENMAI_DT, "genmai") - .init_early = r7s72100_init_early, + .init_early = shmobile_init_delay, .init_machine = genmai_add_standard_devices, .dt_compat = genmai_boards_compat_dt, MACHINE_END -- cgit v1.2.3 From 96bd090066e2150f3970b32f35895de2ab631c95 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Fri, 20 Jun 2014 18:53:01 +0200 Subject: ARM: shmobile: Move r7s72100.h Change location of r7s72100.h so it can be included using "r7s72100.h" instead of the old style . Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/board-genmai.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'arch/arm/mach-shmobile/board-genmai.c') diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c index a0994f36b348..e2a3ba4871c3 100644 --- a/arch/arm/mach-shmobile/board-genmai.c +++ b/arch/arm/mach-shmobile/board-genmai.c @@ -25,11 +25,13 @@ #include #include #include -#include + #include #include + #include "common.h" #include "irqs.h" +#include "r7s72100.h" /* Ether */ static const struct sh_eth_plat_data ether_pdata __initconst = { -- cgit v1.2.3