Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 310112
b: refs/heads/master
c: 11a0b5f
h: refs/heads/master
v: v3
  • Loading branch information
Lee Jones authored and Arnd Bergmann committed Jun 1, 2012
1 parent 17dd129 commit bd24a3f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 855f80cd1683179b251b01d232b3ae228c614766
refs/heads/master: 11a0b5f09c941ede301ed3eee59fd69c2b4850c2
18 changes: 16 additions & 2 deletions trunk/arch/arm/mach-ux500/board-mop500.c
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,13 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
&ab8500_device,
};

static struct platform_device *snowball_of_platform_devs[] __initdata = {
&snowball_led_dev,
&snowball_key_dev,
&snowball_sbnet_dev,
&ab8500_device,
};

static void __init mop500_init_machine(void)
{
struct device *parent = NULL;
Expand Down Expand Up @@ -876,8 +883,15 @@ static void __init u8500_init_machine(void)
ARRAY_SIZE(mop500_i2c2_devices));

} else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {
platform_add_devices(snowball_platform_devs,
ARRAY_SIZE(snowball_platform_devs));
/*
* Devices to be DT:ed:
* snowball_led_dev = todo
* snowball_key_dev = todo
* snowball_sbnet_dev = todo
* ab8500_device = todo
*/
platform_add_devices(snowball_of_platform_devs,
ARRAY_SIZE(snowball_of_platform_devs));

snowball_sdi_init(parent);
} else if (of_machine_is_compatible("st-ericsson,hrefv60+")) {
Expand Down

0 comments on commit bd24a3f

Please sign in to comment.