Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ada46cda authored by Lee Jones's avatar Lee Jones Committed by Arnd Bergmann
Browse files

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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f65c1982

arch/arm/mach-ux500/board-mop500.c

+1 −2
Original line number Diff line number Diff line
@@ -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,