Commit d942d395 authored by Linus Walleij's avatar Linus Walleij

ARM: ux500: delete pointless DT config option

Supporting device tree on the Ux500 is not optional anymore,
so delete the config option and compile this in at all times.

Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent dfc9832c
...@@ -73,11 +73,6 @@ config UX500_AUTO_PLATFORM ...@@ -73,11 +73,6 @@ config UX500_AUTO_PLATFORM
a working kernel. If everything else is disabled, this a working kernel. If everything else is disabled, this
automatically enables MACH_MOP500. automatically enables MACH_MOP500.
config MACH_UX500_DT
bool "Generic U8500 support using device tree"
depends on MACH_MOP500
select USE_OF
endmenu endmenu
config UX500_DEBUG_UART config UX500_DEBUG_UART
......
...@@ -146,7 +146,6 @@ static struct device * __init db8500_soc_device_init(void) ...@@ -146,7 +146,6 @@ static struct device * __init db8500_soc_device_init(void)
return ux500_soc_device_init(soc_id); return ux500_soc_device_init(soc_id);
} }
#ifdef CONFIG_MACH_UX500_DT
static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
/* Requires call-back bindings. */ /* Requires call-back bindings. */
OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata), OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata),
...@@ -219,5 +218,3 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)") ...@@ -219,5 +218,3 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)")
.dt_compat = stericsson_dt_platform_compat, .dt_compat = stericsson_dt_platform_compat,
.restart = ux500_restart, .restart = ux500_restart,
MACHINE_END MACHINE_END
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment