Skip to contentSkip to conversation

ARM: shmobile: Rename to r8a73a4/r8a7790_init_early()

PATCH New Magnus Damm 2 participants 5 messages Aug 7, 2013 – Aug 22, 2013

Subsystems (4)
Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

cover ARM: shmobile: Rename to r8a73a4/r8a7790_init_early()

ARM: shmobile: Rename to r8a73a4/r8a7790_init_early()

[PATCH 01/02] ARM: shmobile: Rename to r8a73a4_init_early() [PATCH 02/02] ARM: shmobile: Rename to r8a7790_init_early()

This series renames r8a73a4/r8a7790_init_delay() to r8a73a4/r8a7790_init_early(). The reason for this is that future SMP code will hook into these functions which will make them handle more than just delay setup.

Signed-off-by Magnus Damm <[email protected]>

---

Written against renesas.git renesas-devel-20130806v4 and [PATCH 00/05] ARM: shmobile: Yet another SMP series

 arch/arm/mach-shmobile/board-ape6evm-reference.c |    2 +-
 arch/arm/mach-shmobile/board-ape6evm.c           |    2 +-
 arch/arm/mach-shmobile/board-lager-reference.c   |    2 +-
 arch/arm/mach-shmobile/board-lager.c             |    2 +-
 arch/arm/mach-shmobile/include/mach/r8a73a4.h    |    2 +-
 arch/arm/mach-shmobile/include/mach/r8a7790.h    |    2 +-
 arch/arm/mach-shmobile/setup-r8a73a4.c           |    4 ++--
 arch/arm/mach-shmobile/setup-r8a7790.c           |    4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)
author maintainer
#1 lore raw

PATCH 1/2 ARM: shmobile: Rename to r8a73a4_init_early()

From: Magnus Damm <[email protected]>

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 <[email protected]>

---

 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(-)
arch/arm/mach-shmobile/board-ape6evm-reference.c +1 -1
@@ -57,7 +57,7 @@ static const char *ape6evm_boards_compat
 };
 
 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
arch/arm/mach-shmobile/board-ape6evm.c +1 -1
@@ -240,7 +240,7 @@ static const char *ape6evm_boards_compat
 };
 
 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
arch/arm/mach-shmobile/include/mach/r8a73a4.h +1 -1
@@ -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__ */
arch/arm/mach-shmobile/setup-r8a73a4.c +2 -2
@@ -207,7 +207,7 @@ void __init r8a73a4_add_standard_devices
 	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_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 */
author maintainer
#2 lore raw

PATCH 2/2 ARM: shmobile: Rename to r8a7790_init_early()

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Rename r8a7790_init_delay() into r8a7790_init_early() to make the function name show that more than just delay setup may happen in the future.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/board-lager-reference.c |    2 +-
 arch/arm/mach-shmobile/board-lager.c           |    2 +-
 arch/arm/mach-shmobile/include/mach/r8a7790.h  |    2 +-
 arch/arm/mach-shmobile/setup-r8a7790.c         |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-shmobile/board-lager-reference.c +1 -1
@@ -38,7 +38,7 @@ static const char *lager_boards_compat_d
 };
 
 DT_MACHINE_START(LAGER_DT, "lager")
-	.init_early	= r8a7790_init_delay,
+	.init_early	= r8a7790_init_early,
 	.init_machine	= lager_add_standard_devices,
 	.init_time	= r8a7790_timer_init,
 	.dt_compat	= lager_boards_compat_dt,
arch/arm/mach-shmobile/board-lager.c +1 -1
@@ -162,7 +162,7 @@ static const char *lager_boards_compat_d
 };
 
 DT_MACHINE_START(LAGER_DT, "lager")
-	.init_early	= r8a7790_init_delay,
+	.init_early	= r8a7790_init_early,
 	.init_time	= r8a7790_timer_init,
 	.init_machine	= lager_add_standard_devices,
 	.dt_compat	= lager_boards_compat_dt,
arch/arm/mach-shmobile/include/mach/r8a7790.h +1 -1
@@ -5,7 +5,7 @@ void r8a7790_add_standard_devices(void);
 void r8a7790_add_dt_devices(void);
 void r8a7790_clock_init(void);
 void r8a7790_pinmux_init(void);
-void r8a7790_init_delay(void);
+void r8a7790_init_early(void);
 void r8a7790_timer_init(void);
 
 #define MD(nr) BIT(nr)
arch/arm/mach-shmobile/setup-r8a7790.c +2 -2
@@ -267,7 +267,7 @@ void __init r8a7790_timer_init(void)
 	clocksource_of_init();
 }
 
-void __init r8a7790_init_delay(void)
+void __init r8a7790_init_early(void)
 {
 #ifndef CONFIG_ARM_ARCH_TIMER
 	shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */

@@ -282,7 +282,7 @@ static const char *r8a7790_boards_compat
 };
 
 DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
-	.init_early	= r8a7790_init_delay,
+	.init_early	= r8a7790_init_early,
 	.init_time	= r8a7790_timer_init,
 	.dt_compat	= r8a7790_boards_compat_dt,
 MACHINE_END
#3 lore raw

cover ARM: shmobile: Rename to r8a73a4/r8a7790_init_early()

In reply to Magnus Damm
Quoted 16 lines · Magnus Damm

ARM: shmobile: Rename to r8a73a4/r8a7790_init_early()

[PATCH 01/02] ARM: shmobile: Rename to r8a73a4_init_early() [PATCH 02/02] ARM: shmobile: Rename to r8a7790_init_early()

This series renames r8a73a4/r8a7790_init_delay() to r8a73a4/r8a7790_init_early(). The reason for this is that future SMP code will hook into these functions which will make them handle more than just delay setup.

Signed-off-by Magnus Damm <[email protected]>

---

Written against renesas.git renesas-devel-20130806v4 and [PATCH 00/05] ARM: shmobile: Yet another SMP series

Quoted 9 lines
 arch/arm/mach-shmobile/board-ape6evm-reference.c |    2 +-
 arch/arm/mach-shmobile/board-ape6evm.c           |    2 +-
 arch/arm/mach-shmobile/board-lager-reference.c   |    2 +-
 arch/arm/mach-shmobile/board-lager.c             |    2 +-
 arch/arm/mach-shmobile/include/mach/r8a73a4.h    |    2 +-
 arch/arm/mach-shmobile/include/mach/r8a7790.h    |    2 +-
 arch/arm/mach-shmobile/setup-r8a73a4.c           |    4 ++--
 arch/arm/mach-shmobile/setup-r8a7790.c           |    4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

Thanks Magnus, I have plan to queue this up in the cleanup4 branch which will most likely happen tomorrow.

#4 lore raw

cover ARM: shmobile: Rename to r8a73a4/r8a7790_init_early()

Quoted 27 lines · Simon Horman
Quoted 16 lines · Magnus Damm

ARM: shmobile: Rename to r8a73a4/r8a7790_init_early()

[PATCH 01/02] ARM: shmobile: Rename to r8a73a4_init_early() [PATCH 02/02] ARM: shmobile: Rename to r8a7790_init_early()

This series renames r8a73a4/r8a7790_init_delay() to r8a73a4/r8a7790_init_early(). The reason for this is that future SMP code will hook into these functions which will make them handle more than just delay setup.

Signed-off-by Magnus Damm <[email protected]>

---

Written against renesas.git renesas-devel-20130806v4 and [PATCH 00/05] ARM: shmobile: Yet another SMP series

Quoted 9 lines
 arch/arm/mach-shmobile/board-ape6evm-reference.c |    2 +-
 arch/arm/mach-shmobile/board-ape6evm.c           |    2 +-
 arch/arm/mach-shmobile/board-lager-reference.c   |    2 +-
 arch/arm/mach-shmobile/board-lager.c             |    2 +-
 arch/arm/mach-shmobile/include/mach/r8a73a4.h    |    2 +-
 arch/arm/mach-shmobile/include/mach/r8a7790.h    |    2 +-
 arch/arm/mach-shmobile/setup-r8a73a4.c           |    4 ++--
 arch/arm/mach-shmobile/setup-r8a7790.c           |    4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)
Quoted 2 lines

Thanks Magnus, I have plan to queue this up in the cleanup4 branch which will most likely happen tomorrow.

It has now happened.