ARM: shmobile: r8a7778: Use shmobile_init_delay()

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-shmobile / setup-r8a7778.c

diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 2ccc0128b469b30a9a7070ab5008975d442f8f05..85fe016d6a872a6233effacc6118f2195d8cdbc8 100644 (file)
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -66,7 +66,7 @@ R8A7778_SCIF(4, 0xffe44000, gic_iid(0x6a));
 R8A7778_SCIF(5, 0xffe45000, gic_iid(0x6b));
 
 #define r8a7778_register_scif(index)                                          \
-       platform_device_register_resndata(&platform_bus, "sh-sci", index,      \
+       platform_device_register_resndata(NULL, "sh-sci", index,               \
                                          scif##index##_resources,             \
                                          ARRAY_SIZE(scif##index##_resources), \
                                          &scif##index##_platform_data,        \
@@ -86,7 +86,7 @@ static struct resource sh_tmu0_resources[] = {
 
 #define r8a7778_register_tmu(idx)                      \
        platform_device_register_resndata(              \
-               &platform_bus, "sh-tmu", idx,           \
+               NULL, "sh-tmu", idx,                    \
                sh_tmu##idx##_resources,                \
                ARRAY_SIZE(sh_tmu##idx##_resources),    \
                &sh_tmu##idx##_platform_data,           \
@@ -175,7 +175,6 @@ static struct resource ohci_resources[] __initdata = {
 
 #define USB_PLATFORM_INFO(hci)                                 \
 static struct platform_device_info hci##_info __initdata = {   \
-       .parent         = &platform_bus,                        \
        .name           = #hci "-platform",                     \
        .id             = -1,                                   \
        .res            = hci##_resources,                      \
@@ -214,7 +213,7 @@ R8A7778_GPIO(4);
 
 #define r8a7778_register_gpio(idx)                             \
        platform_device_register_resndata(                      \
-               &platform_bus, "gpio_rcar", idx,                \
+               NULL, "gpio_rcar", idx,                         \
                r8a7778_gpio##idx##_resources,                  \
                ARRAY_SIZE(r8a7778_gpio##idx##_resources),      \
                &r8a7778_gpio##idx##_platform_data,             \
@@ -294,12 +293,6 @@ void __init r8a7778_add_dt_devices(void)
        }
 #endif
 
-       r8a7778_register_scif(0);
-       r8a7778_register_scif(1);
-       r8a7778_register_scif(2);
-       r8a7778_register_scif(3);
-       r8a7778_register_scif(4);
-       r8a7778_register_scif(5);
        r8a7778_register_tmu(0);
 }
 
@@ -498,8 +491,8 @@ static struct resource hpb_dmae_resources[] __initdata = {
 
 static void __init r8a7778_register_hpb_dmae(void)
 {
-       platform_device_register_resndata(&platform_bus, "hpb-dma-engine", -1,
-                                         hpb_dmae_resources,
+       platform_device_register_resndata(NULL, "hpb-dma-engine",
+                                         -1, hpb_dmae_resources,
                                          ARRAY_SIZE(hpb_dmae_resources),
                                          &dma_platform_data,
                                          sizeof(dma_platform_data));
@@ -508,6 +501,12 @@ static void __init r8a7778_register_hpb_dmae(void)
 void __init r8a7778_add_standard_devices(void)
 {
        r8a7778_add_dt_devices();
+       r8a7778_register_scif(0);
+       r8a7778_register_scif(1);
+       r8a7778_register_scif(2);
+       r8a7778_register_scif(3);
+       r8a7778_register_scif(4);
+       r8a7778_register_scif(5);
        r8a7778_register_i2c(0);
        r8a7778_register_i2c(1);
        r8a7778_register_i2c(2);
@@ -521,6 +520,7 @@ void __init r8a7778_add_standard_devices(void)
 
 void __init r8a7778_init_late(void)
 {
+       shmobile_init_late();
        platform_device_register_full(&ehci_info);
        platform_device_register_full(&ohci_info);
 }
@@ -567,14 +567,14 @@ void __init r8a7778_init_irq_extpin(int irlm)
        r8a7778_init_irq_extpin_dt(irlm);
        if (irlm)
                platform_device_register_resndata(
-                       &platform_bus, "renesas_intc_irqpin", -1,
+                       NULL, "renesas_intc_irqpin", -1,
                        irqpin_resources, ARRAY_SIZE(irqpin_resources),
                        &irqpin_platform_data, sizeof(irqpin_platform_data));
 }
 
 void __init r8a7778_init_delay(void)
 {
-       shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
+       shmobile_init_delay();
 }
 
 #ifdef CONFIG_USE_OF
@@ -610,8 +610,8 @@ static const char *r8a7778_compat_dt[] __initdata = {
 DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")
        .init_early     = r8a7778_init_delay,
        .init_irq       = r8a7778_init_irq_dt,
+       .init_late      = shmobile_init_late,
        .dt_compat      = r8a7778_compat_dt,
-       .init_late      = r8a7778_init_late,
 MACHINE_END
 
 #endif /* CONFIG_USE_OF */