| From 294e932056bdaf3e3aa20497f17dbf077a431452 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Thu, 8 Aug 2013 07:26:48 +0900 |
| Subject: ARM: shmobile: Rename to r8a73a4_init_early() |
| |
| Rename r8a73a4_init_delay() into r8a73a4_init_early() |
| to make the function name show that more than just |
| delay setup may happen in the future. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 0750a54592a2daff70771a1c170f9859d5901d3d) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-ape6evm-reference.c | 2 +- |
| arch/arm/mach-shmobile/board-ape6evm.c | 2 +- |
| arch/arm/mach-shmobile/include/mach/r8a73a4.h | 2 +- |
| arch/arm/mach-shmobile/setup-r8a73a4.c | 4 ++-- |
| 4 files changed, 5 insertions(+), 5 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c |
| index a23fa714f7ac..3276afcf3cc9 100644 |
| --- a/arch/arm/mach-shmobile/board-ape6evm-reference.c |
| +++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c |
| @@ -57,7 +57,7 @@ static const char *ape6evm_boards_compat_dt[] __initdata = { |
| }; |
| |
| DT_MACHINE_START(APE6EVM_DT, "ape6evm") |
| - .init_early = r8a73a4_init_delay, |
| + .init_early = r8a73a4_init_early, |
| .init_machine = ape6evm_add_standard_devices, |
| .dt_compat = ape6evm_boards_compat_dt, |
| MACHINE_END |
| diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c |
| index 24b87eea9da3..d36e23f5d8b7 100644 |
| --- a/arch/arm/mach-shmobile/board-ape6evm.c |
| +++ b/arch/arm/mach-shmobile/board-ape6evm.c |
| @@ -240,7 +240,7 @@ static const char *ape6evm_boards_compat_dt[] __initdata = { |
| }; |
| |
| DT_MACHINE_START(APE6EVM_DT, "ape6evm") |
| - .init_early = r8a73a4_init_delay, |
| + .init_early = r8a73a4_init_early, |
| .init_machine = ape6evm_add_standard_devices, |
| .dt_compat = ape6evm_boards_compat_dt, |
| MACHINE_END |
| diff --git a/arch/arm/mach-shmobile/include/mach/r8a73a4.h b/arch/arm/mach-shmobile/include/mach/r8a73a4.h |
| index f3a9b702da56..5214338a6a47 100644 |
| --- a/arch/arm/mach-shmobile/include/mach/r8a73a4.h |
| +++ b/arch/arm/mach-shmobile/include/mach/r8a73a4.h |
| @@ -5,6 +5,6 @@ void r8a73a4_add_standard_devices(void); |
| void r8a73a4_add_dt_devices(void); |
| void r8a73a4_clock_init(void); |
| void r8a73a4_pinmux_init(void); |
| -void r8a73a4_init_delay(void); |
| +void r8a73a4_init_early(void); |
| |
| #endif /* __ASM_R8A73A4_H__ */ |
| diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c |
| index 89491700afb7..53a896275cae 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a73a4.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a73a4.c |
| @@ -207,7 +207,7 @@ void __init r8a73a4_add_standard_devices(void) |
| r8a73a4_register_thermal(); |
| } |
| |
| -void __init r8a73a4_init_delay(void) |
| +void __init r8a73a4_init_early(void) |
| { |
| #ifndef CONFIG_ARM_ARCH_TIMER |
| shmobile_setup_delay(1500, 2, 4); /* Cortex-A15 @ 1500MHz */ |
| @@ -222,7 +222,7 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = { |
| }; |
| |
| DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)") |
| - .init_early = r8a73a4_init_delay, |
| + .init_early = r8a73a4_init_early, |
| .dt_compat = r8a73a4_boards_compat_dt, |
| MACHINE_END |
| #endif /* CONFIG_USE_OF */ |
| -- |
| 1.8.5.rc3 |
| |