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>

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 1718462..57e89f6 100644 (file)
--- 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 = {
 static struct platform_device *snowball_of_platform_devs[] __initdata = {
        &snowball_led_dev,
        &snowball_key_dev,
-       &snowball_sbnet_dev,
        &ab8500_device,
 };
 
@@ -887,7 +886,7 @@ static void __init u8500_init_machine(void)
                 * Devices to be DT:ed:
                 *   snowball_led_dev   = todo
                 *   snowball_key_dev   = todo
-                *   snowball_sbnet_dev = todo
+                *   snowball_sbnet_dev = done
                 *   ab8500_device      = todo
                 */
                platform_add_devices(snowball_of_platform_devs,