diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-04-22 11:29:30 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-06-17 13:54:30 +0200 |
| commit | 75a7f3f18e0deee2023351789cc3c393f07220c7 (patch) | |
| tree | b74a90f572f10c6c54b90f9eddb2c1419c5d3ff2 /arch/arm/mach-u300/regulator.c | |
| parent | d134636f370070f0aa43bb4b145ed60c440eff17 (diff) | |
ARM: u300: delete all static board data
We have now transferred all the U300 peripherals to the device
tree, so we just select USE_OF, and delete all static board data,
then require that this platform shall be booted using the device
tree and nothing else.
This gets rid of the MMCI (PL180), PL022, and serial PL011
platform data entries and more.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300/regulator.c')
| -rw-r--r-- | arch/arm/mach-u300/regulator.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/mach-u300/regulator.c b/arch/arm/mach-u300/regulator.c index 8a67dc604576..bbda954e00fd 100644 --- a/arch/arm/mach-u300/regulator.c +++ b/arch/arm/mach-u300/regulator.c @@ -58,10 +58,7 @@ static int __init __u300_init_boardpower(struct platform_device *pdev) u32 val; pr_info("U300: setting up board power\n"); - if (pdev) - main_power_15 = regulator_get(&pdev->dev, "vana15"); - else - main_power_15 = regulator_get(NULL, "vana15"); + main_power_15 = regulator_get(&pdev->dev, "vana15"); if (IS_ERR(main_power_15)) { pr_err("could not get vana15"); @@ -114,11 +111,8 @@ static struct platform_driver s365_board_driver = { */ static int __init u300_init_boardpower(void) { - if (of_have_populated_dt()) - return platform_driver_probe(&s365_board_driver, - s365_board_probe); - /* Only call this on non-DT boots */ - return __u300_init_boardpower(NULL); + return platform_driver_probe(&s365_board_driver, + s365_board_probe); } device_initcall(u300_init_boardpower); |