Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 310119
b: refs/heads/master
c: 48a4ea6
h: refs/heads/master
i:
  310117: 7d01f71
  310115: 9e17014
  310111: 17dd129
v: v3
  • Loading branch information
Lee Jones authored and Arnd Bergmann committed Jun 1, 2012
1 parent 66874b4 commit 2053513
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 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: 93b5698aae844f75709f759a6c92109ce40780da
refs/heads/master: 48a4ea626ddfad1c714ac4e3b7049347c22f2aa2
7 changes: 4 additions & 3 deletions trunk/arch/arm/mach-ux500/board-mop500.c
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
static struct platform_device *snowball_of_platform_devs[] __initdata = {
&snowball_led_dev,
&snowball_key_dev,
&ab8500_device,
};

static void __init mop500_init_machine(void)
Expand Down Expand Up @@ -841,6 +840,9 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
static const struct of_device_id u8500_local_bus_nodes[] = {
/* only create devices below soc node */
{ .compatible = "stericsson,db8500", },
{ .compatible = "stericsson,db8500-prcmu", },
{ .compatible = "stericsson,ab8500", },
{ .compatible = "stericsson,ab8500-regulator", },
{ .compatible = "simple-bus"},
{ },
};
Expand Down Expand Up @@ -876,7 +878,6 @@ static void __init u8500_init_machine(void)
ARRAY_SIZE(mop500_platform_devs));

mop500_sdi_init(parent);

i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
i2c_register_board_info(2, mop500_i2c2_devices,
Expand All @@ -888,7 +889,7 @@ static void __init u8500_init_machine(void)
* snowball_led_dev = todo
* snowball_key_dev = todo
* snowball_sbnet_dev = done
* ab8500_device = todo
* ab8500_device = done
*/
platform_add_devices(snowball_of_platform_devs,
ARRAY_SIZE(snowball_of_platform_devs));
Expand Down

0 comments on commit 2053513

Please sign in to comment.