diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-05-29 04:28:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-06-01 02:04:05 +0200 |
| commit | ada46cda50369444a81a2cf4bf21f580fcb1d6d1 (patch) | |
| tree | 44169613e0d6541ed15755c93c1433731878a3ff /arch | |
| parent | ARM: ux500: New DT:ed u8500_init_devices for one-by-one device enablement (diff) | |
| download | linux-ada46cda50369444a81a2cf4bf21f580fcb1d6d1.tar.xz linux-ada46cda50369444a81a2cf4bf21f580fcb1d6d1.zip | |
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')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 3 |
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 = { 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, |