Skip to content

Commit

Permalink
ARM: ux500: Disable SMSC911x platform code registration when DT is en…
Browse files Browse the repository at this point in the history
…abled

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>
  • Loading branch information
Lee Jones authored and Arnd Bergmann committed Jun 1, 2012
1 parent f65c198 commit ada46cd
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions arch/arm/mach-ux500/board-mop500.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit ada46cd

Please sign in to comment.