diff options
-rw-r--r-- | arch/arm/mach-shmobile/board-lager-reference.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-lager.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/r8a7790.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7790.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c index 9c316a1b2e32..2856f51ff8a6 100644 --- a/arch/arm/mach-shmobile/board-lager-reference.c +++ b/arch/arm/mach-shmobile/board-lager-reference.c | |||
@@ -38,7 +38,7 @@ static const char *lager_boards_compat_dt[] __initdata = { | |||
38 | }; | 38 | }; |
39 | 39 | ||
40 | DT_MACHINE_START(LAGER_DT, "lager") | 40 | DT_MACHINE_START(LAGER_DT, "lager") |
41 | .init_early = r8a7790_init_delay, | 41 | .init_early = r8a7790_init_early, |
42 | .init_machine = lager_add_standard_devices, | 42 | .init_machine = lager_add_standard_devices, |
43 | .init_time = r8a7790_timer_init, | 43 | .init_time = r8a7790_timer_init, |
44 | .dt_compat = lager_boards_compat_dt, | 44 | .dt_compat = lager_boards_compat_dt, |
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index ffb6f0ac7606..4047fac811c0 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c | |||
@@ -161,7 +161,7 @@ static const char *lager_boards_compat_dt[] __initdata = { | |||
161 | }; | 161 | }; |
162 | 162 | ||
163 | DT_MACHINE_START(LAGER_DT, "lager") | 163 | DT_MACHINE_START(LAGER_DT, "lager") |
164 | .init_early = r8a7790_init_delay, | 164 | .init_early = r8a7790_init_early, |
165 | .init_time = r8a7790_timer_init, | 165 | .init_time = r8a7790_timer_init, |
166 | .init_machine = lager_add_standard_devices, | 166 | .init_machine = lager_add_standard_devices, |
167 | .dt_compat = lager_boards_compat_dt, | 167 | .dt_compat = lager_boards_compat_dt, |
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7790.h b/arch/arm/mach-shmobile/include/mach/r8a7790.h index 788d55952091..177a8372abb7 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a7790.h +++ b/arch/arm/mach-shmobile/include/mach/r8a7790.h | |||
@@ -5,7 +5,7 @@ void r8a7790_add_standard_devices(void); | |||
5 | void r8a7790_add_dt_devices(void); | 5 | void r8a7790_add_dt_devices(void); |
6 | void r8a7790_clock_init(void); | 6 | void r8a7790_clock_init(void); |
7 | void r8a7790_pinmux_init(void); | 7 | void r8a7790_pinmux_init(void); |
8 | void r8a7790_init_delay(void); | 8 | void r8a7790_init_early(void); |
9 | void r8a7790_timer_init(void); | 9 | void r8a7790_timer_init(void); |
10 | 10 | ||
11 | #define MD(nr) BIT(nr) | 11 | #define MD(nr) BIT(nr) |
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c index d0f5c9f9349a..a42d1f6f1f81 100644 --- a/arch/arm/mach-shmobile/setup-r8a7790.c +++ b/arch/arm/mach-shmobile/setup-r8a7790.c | |||
@@ -267,7 +267,7 @@ void __init r8a7790_timer_init(void) | |||
267 | clocksource_of_init(); | 267 | clocksource_of_init(); |
268 | } | 268 | } |
269 | 269 | ||
270 | void __init r8a7790_init_delay(void) | 270 | void __init r8a7790_init_early(void) |
271 | { | 271 | { |
272 | #ifndef CONFIG_ARM_ARCH_TIMER | 272 | #ifndef CONFIG_ARM_ARCH_TIMER |
273 | shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */ | 273 | shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */ |
@@ -282,7 +282,7 @@ static const char *r8a7790_boards_compat_dt[] __initdata = { | |||
282 | }; | 282 | }; |
283 | 283 | ||
284 | DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)") | 284 | DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)") |
285 | .init_early = r8a7790_init_delay, | 285 | .init_early = r8a7790_init_early, |
286 | .init_time = r8a7790_timer_init, | 286 | .init_time = r8a7790_timer_init, |
287 | .dt_compat = r8a7790_boards_compat_dt, | 287 | .dt_compat = r8a7790_boards_compat_dt, |
288 | MACHINE_END | 288 | MACHINE_END |