diff options
author | Lee Jones <lee.jones@linaro.org> | 2013-08-22 10:52:30 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-09-26 05:08:26 -0400 |
commit | 254a40783d353528fce527d1f512189255b4b40c (patch) | |
tree | 413b299869275e362a308afc280ff30c59d9faf3 | |
parent | a0998b8321eb5f53ef51924f5ab6c69237ac1025 (diff) |
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.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 8 |
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 f8885c56abf2..8f6c1ea7b216 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 = { | |||
79 | 79 | ||
80 | static void __init mop500_init_machine(void) | 80 | static void __init mop500_init_machine(void) |
81 | { | 81 | { |
82 | struct device *parent = NULL; | ||
83 | |||
84 | platform_device_register(&db8500_prcmu_device); | 82 | platform_device_register(&db8500_prcmu_device); |
85 | 83 | ||
86 | parent = u8500_init_devices(); | ||
87 | |||
88 | /* This board has full regulator constraints */ | 84 | /* This board has full regulator constraints */ |
89 | regulator_has_full_constraints(); | 85 | regulator_has_full_constraints(); |
90 | } | 86 | } |
@@ -92,24 +88,16 @@ static void __init mop500_init_machine(void) | |||
92 | 88 | ||
93 | static void __init snowball_init_machine(void) | 89 | static void __init snowball_init_machine(void) |
94 | { | 90 | { |
95 | struct device *parent = NULL; | ||
96 | |||
97 | platform_device_register(&db8500_prcmu_device); | 91 | platform_device_register(&db8500_prcmu_device); |
98 | 92 | ||
99 | parent = u8500_init_devices(); | ||
100 | |||
101 | /* This board has full regulator constraints */ | 93 | /* This board has full regulator constraints */ |
102 | regulator_has_full_constraints(); | 94 | regulator_has_full_constraints(); |
103 | } | 95 | } |
104 | 96 | ||
105 | static void __init hrefv60_init_machine(void) | 97 | static void __init hrefv60_init_machine(void) |
106 | { | 98 | { |
107 | struct device *parent = NULL; | ||
108 | |||
109 | platform_device_register(&db8500_prcmu_device); | 99 | platform_device_register(&db8500_prcmu_device); |
110 | 100 | ||
111 | parent = u8500_init_devices(); | ||
112 | |||
113 | /* This board has full regulator constraints */ | 101 | /* This board has full regulator constraints */ |
114 | regulator_has_full_constraints(); | 102 | regulator_has_full_constraints(); |
115 | } | 103 | } |
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 89232dd99673..2e85c1e72535 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) | |||
135 | return ux500_soc_device_init(soc_id); | 135 | return ux500_soc_device_init(soc_id); |
136 | } | 136 | } |
137 | 137 | ||
138 | /* | ||
139 | * This function is called from the board init | ||
140 | */ | ||
141 | struct device * __init u8500_init_devices(void) | ||
142 | { | ||
143 | return db8500_soc_device_init(); | ||
144 | } | ||
145 | |||
146 | #ifdef CONFIG_MACH_UX500_DT | 138 | #ifdef CONFIG_MACH_UX500_DT |
147 | static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { | 139 | static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { |
148 | /* Requires call-back bindings. */ | 140 | /* Requires call-back bindings. */ |