Skip to contentSkip to conversation

ARM: shmobile: r8a73a4: Use shmobile_init_delay()

PATCH In review Magnus Damm 1 participant 1 message Aug 20, 2014

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

PATCH 7/10 ARM: shmobile: r8a73a4: Use shmobile_init_delay()

From: Magnus Damm <[email protected]>

Adjust the r8a73a4 SoC support code to use shmobile_init_delay() together with CPU Frequency settings from the DTS. Get rid of the C code version and r8a73a4_init_early() that now are unused.

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

---

 arch/arm/mach-shmobile/r8a73a4.h       |    1 -
 arch/arm/mach-shmobile/setup-r8a73a4.c |    9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)
arch/arm/mach-shmobile/r8a73a4.h +0 -1
@@ -14,6 +14,5 @@ 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_early(void);
 
 #endif /* __ASM_R8A73A4_H__ */
arch/arm/mach-shmobile/setup-r8a73a4.c +1 -8
@@ -295,13 +295,6 @@ void __init r8a73a4_add_standard_devices
 	r8a73a4_register_dmac();
 }
 
-void __init r8a73a4_init_early(void)
-{
-#ifndef CONFIG_ARM_ARCH_TIMER
-	shmobile_setup_delay(1500, 2, 4); /* Cortex-A15 @ 1500MHz */
-#endif
-}
-
 #ifdef CONFIG_USE_OF
 
 static const char *r8a73a4_boards_compat_dt[] __initdata = {

@@ -310,7 +303,7 @@ static const char *r8a73a4_boards_compat
 };
 
 DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
-	.init_early	= r8a73a4_init_early,
+	.init_early	= shmobile_init_delay,
 	.init_late	= shmobile_init_late,
 	.dt_compat	= r8a73a4_boards_compat_dt,
 MACHINE_END