summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-08-22 15:52:30 +0100
committerLinus Walleij <linus.walleij@linaro.org>2013-09-26 11:08:26 +0200
commit254a40783d353528fce527d1f512189255b4b40c (patch)
tree413b299869275e362a308afc280ff30c59d9faf3
parenta0998b8321eb5f53ef51924f5ab6c69237ac1025 (diff)
downloadop-kernel-dev-254a40783d353528fce527d1f512189255b4b40c.zip
op-kernel-dev-254a40783d353528fce527d1f512189255b4b40c.tar.gz
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>
-rw-r--r--arch/arm/mach-ux500/board-mop500.c12
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c8
2 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index f8885c5..8f6c1ea 100644
--- 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 89232dd..2e85c1e 100644
--- 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. */
OpenPOWER on IntegriCloud