aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-shmobile/rcar-gen2.h1
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7790.c1
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7791.c1
-rw-r--r--arch/arm/mach-shmobile/setup-rcar-gen2.c3
4 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/rcar-gen2.h b/arch/arm/mach-shmobile/rcar-gen2.h
index 43f606eb2d82..ce53cb5f53a1 100644
--- a/arch/arm/mach-shmobile/rcar-gen2.h
+++ b/arch/arm/mach-shmobile/rcar-gen2.h
@@ -4,5 +4,6 @@
4void rcar_gen2_timer_init(void); 4void rcar_gen2_timer_init(void);
5#define MD(nr) BIT(nr) 5#define MD(nr) BIT(nr)
6u32 rcar_gen2_read_mode_pins(void); 6u32 rcar_gen2_read_mode_pins(void);
7void rcar_gen2_reserve(void);
7 8
8#endif /* __ASM_RCAR_GEN2_H__ */ 9#endif /* __ASM_RCAR_GEN2_H__ */
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 516b4e4a3ddd..e1907686ace4 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -327,6 +327,7 @@ DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
327 .init_early = r8a7790_init_early, 327 .init_early = r8a7790_init_early,
328 .init_time = rcar_gen2_timer_init, 328 .init_time = rcar_gen2_timer_init,
329 .init_late = shmobile_init_late, 329 .init_late = shmobile_init_late,
330 .reserve = rcar_gen2_reserve,
330 .dt_compat = r8a7790_boards_compat_dt, 331 .dt_compat = r8a7790_boards_compat_dt,
331MACHINE_END 332MACHINE_END
332#endif /* CONFIG_USE_OF */ 333#endif /* CONFIG_USE_OF */
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index 9e16b1daba59..7e970d005f7f 100644
--- a/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -218,6 +218,7 @@ DT_MACHINE_START(R8A7791_DT, "Generic R8A7791 (Flattened Device Tree)")
218 .init_early = shmobile_init_delay, 218 .init_early = shmobile_init_delay,
219 .init_time = rcar_gen2_timer_init, 219 .init_time = rcar_gen2_timer_init,
220 .init_late = shmobile_init_late, 220 .init_late = shmobile_init_late,
221 .reserve = rcar_gen2_reserve,
221 .dt_compat = r8a7791_boards_compat_dt, 222 .dt_compat = r8a7791_boards_compat_dt,
222MACHINE_END 223MACHINE_END
223#endif /* CONFIG_USE_OF */ 224#endif /* CONFIG_USE_OF */
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index fdc714ebc4cd..544b9bf28840 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -20,8 +20,11 @@
20 20
21#include <linux/clk/shmobile.h> 21#include <linux/clk/shmobile.h>
22#include <linux/clocksource.h> 22#include <linux/clocksource.h>
23#include <linux/device.h>
24#include <linux/dma-contiguous.h>
23#include <linux/io.h> 25#include <linux/io.h>
24#include <linux/kernel.h> 26#include <linux/kernel.h>
27#include <linux/of_fdt.h>
25#include <asm/mach/arch.h> 28#include <asm/mach/arch.h>
26#include "common.h" 29#include "common.h"
27#include "rcar-gen2.h" 30#include "rcar-gen2.h"