aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-05-28 22:28:34 -0400
committerArnd Bergmann <arnd@arndb.de>2012-05-31 20:04:05 -0400
commitada46cda50369444a81a2cf4bf21f580fcb1d6d1 (patch)
tree44169613e0d6541ed15755c93c1433731878a3ff /arch/arm
parentf65c1982faca257053564e7ba6864ee9506f6a83 (diff)
ARM: ux500: Disable SMSC911x platform code registration when DT is enabled
Now the SCMC911x is correctly enabled in Device Tree, there is no need to continue registering it from platform code. In fact, if we continue doing so, the system will throw an error on boot. Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ux500/board-mop500.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 1718462622c5..57e89f60ae4b 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -679,7 +679,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
679static struct platform_device *snowball_of_platform_devs[] __initdata = { 679static struct platform_device *snowball_of_platform_devs[] __initdata = {
680 &snowball_led_dev, 680 &snowball_led_dev,
681 &snowball_key_dev, 681 &snowball_key_dev,
682 &snowball_sbnet_dev,
683 &ab8500_device, 682 &ab8500_device,
684}; 683};
685 684
@@ -887,7 +886,7 @@ static void __init u8500_init_machine(void)
887 * Devices to be DT:ed: 886 * Devices to be DT:ed:
888 * snowball_led_dev = todo 887 * snowball_led_dev = todo
889 * snowball_key_dev = todo 888 * snowball_key_dev = todo
890 * snowball_sbnet_dev = todo 889 * snowball_sbnet_dev = done
891 * ab8500_device = todo 890 * ab8500_device = todo
892 */ 891 */
893 platform_add_devices(snowball_of_platform_devs, 892 platform_add_devices(snowball_of_platform_devs,