3 files changed, 26 insertions, 1 deletions

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index d1bd2bac22f0..1718462622c5 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -859,7 +859,7 @@ static void __init u8500_init_machine(void)
         else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
                 hrefv60_pinmaps_init();
 
-        parent = u8500_init_devices();
+        parent = u8500_of_init_devices();
 
         for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++)
                 mop500_platform_devs[i]->dev.parent = parent;
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index bc44c07c71a9..3be0cb8f8914 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -92,4 +92,7 @@ void __init hrefv60_pinmaps_init(void);
 void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
                 unsigned n);
 
+/* TODO: Once all pieces are DT:ed, remove completely. */
+struct device * __init u8500_of_init_devices(void);
+
 #endif
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 16169c4bf6ca..04244b081a47 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -222,6 +222,28 @@ struct device * __init u8500_init_devices(void)
         platform_device_register_data(parent,
                 "cpufreq-u8500", -1, NULL, 0);
 
+        for (i = 0; i < ARRAY_SIZE(platform_devs); i++)
+                platform_devs[i]->dev.parent = parent;
+
+        platform_add_devices(platform_devs, ARRAY_SIZE(platform_devs));
+
+        return parent;
+}
+
+/* TODO: Once all pieces are DT:ed, remove completely. */
+struct device * __init u8500_of_init_devices(void)
+{
+        struct device *parent;
+        int i;
+
+        parent = db8500_soc_device_init();
+
+        db8500_add_rtc(parent);
+        db8500_add_usb(parent, usb_db8500_rx_dma_cfg, usb_db8500_tx_dma_cfg);
+
+        platform_device_register_data(parent,
+                "cpufreq-u8500", -1, NULL, 0);
+
         for (i = 0; i < ARRAY_SIZE(of_platform_devs); i++)
                 of_platform_devs[i]->dev.parent = parent;