ARM: shmobile: r8a7779: Use shmobile_init_delay()

Use shmobile_init_delay() on r8a7779 SoC.

Convert r8a7779 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 r8a7779 SoC.

Based on work for the r8a7740 SoC by Magnus Damm.

Based on the renesas-devel-v3.15-rc5-20140516
tag of my renesas tree.

Simon Horman (4):
ARM: shmobile: r8a7779: Add Maximum CPU Frequency to DTS
ARM: shmobile: r8a7779: Use DT CPU Frequency in common case
ARM: shmobile: marzen-reference: Use DT CPU Frequency
ARM: shmobile: r8a7779: Remove unused r8a7779_init_delay()

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

1.8.5.2

Add 1GHz to the r8a7779 DTS to describe the maximum CPU frequency.

Based on work by Magnus dam for the r8a7740 SoC.

---
 arch/arm/boot/dts/r8a7779.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

index bdaaadc..038c16a 100644
@@ -26,21 +26,25 @@
 			device_type = "cpu";
 			compatible = "arm,cortex-a9";
 			reg = <0>;
+			clock-frequency = <1000000000>;
 		};
 		cpu at 1 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a9";
 			reg = <1>;
+			clock-frequency = <1000000000>;
 		};
 		cpu at 2 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a9";
 			reg = <2>;
+			clock-frequency = <1000000000>;
 		};
 		cpu at 3 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a9";
 			reg = <3>;
+			clock-frequency = <1000000000>;
 		};
 	};
 

1.8.5.2

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

Based on work by Magnus dam for the r8a7740 SoC.

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

index c0e61d5..3cad080 100644
@@ -773,7 +773,7 @@ static const char *r8a7779_compat_dt[] __initdata = {
 
 DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")
 	.map_io		= r8a7779_map_io,
-	.init_early	= r8a7779_init_delay,
+	.init_early	= shmobile_init_delay,
 	.nr_irqs	= NR_IRQS_LEGACY,
 	.init_irq	= r8a7779_init_irq_dt,
 	.init_machine	= r8a7779_add_standard_devices_dt,

1.8.5.2

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

Based on work for the Armadillo800 EVA board by Magnus Damm.

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

index c6c133d..dbfec58 100644
@@ -66,7 +66,7 @@ static const char *marzen_boards_compat_dt[] __initdata = {
 DT_MACHINE_START(MARZEN, "marzen")
 	.smp		= smp_ops(r8a7779_smp_ops),
 	.map_io		= r8a7779_map_io,
-	.init_early	= r8a7779_init_delay,
+	.init_early	= shmobile_init_delay,
 	.init_time	= marzen_init_timer,
 	.nr_irqs	= NR_IRQS_LEGACY,
 	.init_irq	= r8a7779_init_irq_dt,

1.8.5.2

Remove the now unused r8a7779_init_delay() function.

Based on work for the r8a7740 SoC by Magnus Damm.

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

index 757b903..e443c54 100644
@@ -21,7 +21,6 @@ static inline struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d)
 	return &container_of(d, struct r8a7779_pm_domain, genpd)->ch;
 }
 
-extern void r8a7779_init_delay(void);
 extern void r8a7779_init_irq_extpin(int irlm);
 extern void r8a7779_init_irq_extpin_dt(int irlm);
 extern void r8a7779_init_irq_dt(void);

index 3cad080..a57a454 100644
@@ -737,11 +737,6 @@ void __init r8a7779_init_irq_dt(void)
 	__raw_writel(0x003fee3f, INT2SMSKCR4);
 }
 
-void __init r8a7779_init_delay(void)
-{
-	shmobile_setup_delay(1000, 2, 4); /* Cortex-A9 @ 1000MHz */
-}
-
 void __init r8a7779_add_standard_devices_dt(void)
 {
 	platform_add_devices(r8a7779_devices_dt,

1.8.5.2

As no objections have been raised and this follows a pattern already used for several over SoCs I will queue this up.