ARM: shmobile: Use shmobile_init_delay() on r8a7740

ARM: shmobile: Use shmobile_init_delay() on r8a7740

[PATCH 01/04] ARM: shmobile: Add r8a7740 Maximum CPU Frequency to DTS [PATCH 02/04] ARM: shmobile: Use r8a7740 DT CPU Frequency in common case [PATCH 03/04] ARM: shmobile: Use r8a7740 DT CPU Frequency for Armadillo DT Ref [PATCH 04/04] ARM: shmobile: Remove unused r8a7740_init_delay()

Convert r8a7740 to rely on shmobile_init_delay() instead of using a per-SoC delay setup function. This is a cleanup towards enabling Multiplatform support for the r8a7740 SoC.

---

Written against renesas-devel-v3.15-rc3-20140502

 arch/arm/boot/dts/r8a7740.dtsi                           |    1 +
 arch/arm/mach-shmobile/board-armadillo800eva-reference.c |    2 +-
 arch/arm/mach-shmobile/include/mach/r8a7740.h            |    1 -
 arch/arm/mach-shmobile/setup-r8a7740.c                   |    7 +------
 4 files changed, 3 insertions(+), 8 deletions(-)

From: Magnus Damm <[email protected]>

Add 800 MHz to the r8a7740 DTS to describe the maximum CPU frequency.

---

 arch/arm/boot/dts/r8a7740.dtsi |    1 +
 1 file changed, 1 insertion(+)

@@ -22,6 +22,7 @@
 			compatible = "arm,cortex-a9";
 			device_type = "cpu";
 			reg = <0x0>;
+			clock-frequency = <800000000>;
 		};
 	};
 

From: Magnus Damm <[email protected]>

Convert the common C-code-less r8a7740 DT board support to use shmobile_init_delay() to be able to migrate away from per-SoC delay setup functions.

---

 arch/arm/mach-shmobile/setup-r8a7740.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -924,7 +924,7 @@ static const char *r8a7740_boards_compat
 
 DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")
 	.map_io		= r8a7740_map_io,
-	.init_early	= r8a7740_init_delay,
+	.init_early	= shmobile_init_delay,
 	.init_irq	= r8a7740_init_irq_of,
 	.init_machine	= r8a7740_generic_init,
 	.dt_compat	= r8a7740_boards_compat_dt,

From: Magnus Damm <[email protected]>

Convert the Armadillo r8a7740 DT reference board support to use shmobile_init_delay() to be able to migrate away from per-SoC delay setup functions.

---

 arch/arm/mach-shmobile/board-armadillo800eva-reference.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -187,7 +187,7 @@ static const char *eva_boards_compat_dt[
 
 DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva-reference")
 	.map_io		= r8a7740_map_io,
-	.init_early	= r8a7740_init_delay,
+	.init_early	= shmobile_init_delay,
 	.init_irq	= r8a7740_init_irq_of,
 	.init_machine	= eva_init,
 	.init_late	= shmobile_init_late,

From: Magnus Damm <[email protected]>

Remove the now unused r8a7740_init_delay() function.

---

 arch/arm/mach-shmobile/include/mach/r8a7740.h |    1 -
 arch/arm/mach-shmobile/setup-r8a7740.c        |    5 -----
 2 files changed, 6 deletions(-)

@@ -47,7 +47,6 @@ enum {
 };
 
 extern void r8a7740_meram_workaround(void);
-extern void r8a7740_init_delay(void);
 extern void r8a7740_init_irq_of(void);
 extern void r8a7740_map_io(void);
 extern void r8a7740_add_early_devices(void);

@@ -876,11 +876,6 @@ void __init r8a7740_add_standard_devices
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
-void __init r8a7740_init_delay(void)
-{
-	shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
-};
-
 void __init r8a7740_init_irq_of(void)
 {
 	void __iomem *intc_prio_base = ioremap_nocache(0xe6900010, 0x10);

Hi Magnus,

Thanks!

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Thanks, I have queued these up.