ARM: ux500: Stop requesting the SoC device to play 'parent' role

There are no more devices which require left to register which require
a parent. This is part of the ux500 conversion over to Device Tree only
booting.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index f8885c56abf28cccc0a7d585f2a1fb23cc715d08..8f6c1ea7b2164450fd05382d2275d6abba4e750c 100644 (file)
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -79,12 +79,8 @@ struct pl022_ssp_controller ssp0_plat = {
 
 static void __init mop500_init_machine(void)
 {
-       struct device *parent = NULL;
-
        platform_device_register(&db8500_prcmu_device);
 
-       parent = u8500_init_devices();
-
        /* This board has full regulator constraints */
        regulator_has_full_constraints();
 }
@@ -92,24 +88,16 @@ static void __init mop500_init_machine(void)
 
 static void __init snowball_init_machine(void)
 {
-       struct device *parent = NULL;
-
        platform_device_register(&db8500_prcmu_device);
 
-       parent = u8500_init_devices();
-
        /* This board has full regulator constraints */
        regulator_has_full_constraints();
 }
 
 static void __init hrefv60_init_machine(void)
 {
-       struct device *parent = NULL;
-
        platform_device_register(&db8500_prcmu_device);
 
-       parent = u8500_init_devices();
-
        /* This board has full regulator constraints */
        regulator_has_full_constraints();
 }

diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 89232dd996737a77e538eb340a7b6ab668a22c91..2e85c1e72535138a1b90c543ec3e95e2b36a6fa6 100644 (file)
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -135,14 +135,6 @@ static struct device * __init db8500_soc_device_init(void)
        return ux500_soc_device_init(soc_id);
 }
 
-/*
- * This function is called from the board init
- */
-struct device * __init u8500_init_devices(void)
-{
-       return db8500_soc_device_init();
-}
-
 #ifdef CONFIG_MACH_UX500_DT
 static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
        /* Requires call-back bindings. */