1 files changed, 32 insertions, 28 deletions

diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 3d5eacaba3e6..8894e1b7ab0e 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -36,6 +36,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
+#include <asm/hardware/cache-l2x0.h>
 
 #include "common.h"
 #include "dma-register.h"
@@ -311,10 +312,6 @@ static struct platform_device ipmmu_device = {
         .num_resources  = ARRAY_SIZE(ipmmu_resources),
 };
 
-static struct platform_device *r8a7740_devices_dt[] __initdata = {
-        &cmt1_device,
-};
-
 static struct platform_device *r8a7740_early_devices[] __initdata = {
         &scif0_device,
         &scif1_device,
@@ -331,6 +328,7 @@ static struct platform_device *r8a7740_early_devices[] __initdata = {
         &irqpin3_device,
         &tmu0_device,
         &ipmmu_device,
+        &cmt1_device,
 };
 
 /* DMA */
@@ -747,6 +745,19 @@ static void r8a7740_i2c_workaround(struct platform_device *pdev)
 
 void __init r8a7740_add_standard_devices(void)
 {
+        static struct pm_domain_device domain_devices[] __initdata = {
+                { "A3SP", &scif0_device },
+                { "A3SP", &scif1_device },
+                { "A3SP", &scif2_device },
+                { "A3SP", &scif3_device },
+                { "A3SP", &scif4_device },
+                { "A3SP", &scif5_device },
+                { "A3SP", &scif6_device },
+                { "A3SP", &scif7_device },
+                { "A3SP", &scif8_device },
+                { "A3SP", &i2c1_device },
+        };
+
         /* I2C work-around */
         r8a7740_i2c_workaround(&i2c0_device);
         r8a7740_i2c_workaround(&i2c1_device);
@@ -756,31 +767,18 @@ void __init r8a7740_add_standard_devices(void)
         /* add devices */
         platform_add_devices(r8a7740_early_devices,
                             ARRAY_SIZE(r8a7740_early_devices));
-        platform_add_devices(r8a7740_devices_dt,
-                            ARRAY_SIZE(r8a7740_devices_dt));
         platform_add_devices(r8a7740_late_devices,
                              ARRAY_SIZE(r8a7740_late_devices));
 
         /* add devices to PM domain  */
-
-        rmobile_add_device_to_domain("A3SP",    &scif0_device);
-        rmobile_add_device_to_domain("A3SP",    &scif1_device);
-        rmobile_add_device_to_domain("A3SP",    &scif2_device);
-        rmobile_add_device_to_domain("A3SP",    &scif3_device);
-        rmobile_add_device_to_domain("A3SP",    &scif4_device);
-        rmobile_add_device_to_domain("A3SP",    &scif5_device);
-        rmobile_add_device_to_domain("A3SP",    &scif6_device);
-        rmobile_add_device_to_domain("A3SP",    &scif7_device);
-        rmobile_add_device_to_domain("A3SP",    &scif8_device);
-        rmobile_add_device_to_domain("A3SP",    &i2c1_device);
+        rmobile_add_devices_to_domains(domain_devices,
+                                       ARRAY_SIZE(domain_devices));
 }
 
 void __init r8a7740_add_early_devices(void)
 {
         early_platform_add_devices(r8a7740_early_devices,
                                    ARRAY_SIZE(r8a7740_early_devices));
-        early_platform_add_devices(r8a7740_devices_dt,
-                                   ARRAY_SIZE(r8a7740_devices_dt));
 
         /* setup early console here as well */
         shmobile_setup_console();
@@ -788,13 +786,6 @@ void __init r8a7740_add_early_devices(void)
 
 #ifdef CONFIG_USE_OF
 
-void __init r8a7740_add_standard_devices_dt(void)
-{
-        platform_add_devices(r8a7740_devices_dt,
-                            ARRAY_SIZE(r8a7740_devices_dt));
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
-
 void __init r8a7740_init_irq_of(void)
 {
         void __iomem *intc_prio_base = ioremap_nocache(0xe6900010, 0x10);
@@ -827,8 +818,20 @@ void __init r8a7740_init_irq_of(void)
 
 static void __init r8a7740_generic_init(void)
 {
-        r8a7740_clock_init(0);
-        r8a7740_add_standard_devices_dt();
+        r8a7740_meram_workaround();
+
+#ifdef CONFIG_CACHE_L2X0
+        /* Shared attribute override enable, 32K*8way */
+        l2x0_init(IOMEM(0xf0002000), 0x00400000, 0xc20f0fff);
+#endif
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+#define RESCNT2 IOMEM(0xe6188020)
+static void r8a7740_restart(enum reboot_mode mode, const char *cmd)
+{
+        /* Do soft power on reset */
+        writel(1 << 31, RESCNT2);
 }
 
 static const char *r8a7740_boards_compat_dt[] __initdata = {
@@ -843,6 +846,7 @@ DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")
         .init_machine   = r8a7740_generic_init,
         .init_late      = shmobile_init_late,
         .dt_compat      = r8a7740_boards_compat_dt,
+        .restart        = r8a7740_restart,
 MACHINE_END
 
 #endif /* CONFIG_USE_OF */