Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 310113
b: refs/heads/master
c: f65c198
h: refs/heads/master
i:
  310111: 17dd129
v: v3
  • Loading branch information
Lee Jones authored and Arnd Bergmann committed Jun 1, 2012
1 parent bd24a3f commit f01acb6
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 2 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: 11a0b5f09c941ede301ed3eee59fd69c2b4850c2
refs/heads/master: f65c1982faca257053564e7ba6864ee9506f6a83
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-ux500/board-mop500.c
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ static void __init u8500_init_machine(void)
else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
hrefv60_pinmaps_init();

parent = u8500_init_devices();
parent = u8500_of_init_devices();

for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++)
mop500_platform_devs[i]->dev.parent = parent;
Expand Down
3 changes: 3 additions & 0 deletions trunk/arch/arm/mach-ux500/board-mop500.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,7 @@ void __init hrefv60_pinmaps_init(void);
void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
unsigned n);

/* TODO: Once all pieces are DT:ed, remove completely. */
struct device * __init u8500_of_init_devices(void);

#endif
22 changes: 22 additions & 0 deletions trunk/arch/arm/mach-ux500/cpu-db8500.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,28 @@ struct device * __init u8500_init_devices(void)
db8500_add_gpios(parent);
db8500_add_usb(parent, usb_db8500_rx_dma_cfg, usb_db8500_tx_dma_cfg);

platform_device_register_data(parent,
"cpufreq-u8500", -1, NULL, 0);

for (i = 0; i < ARRAY_SIZE(platform_devs); i++)
platform_devs[i]->dev.parent = parent;

platform_add_devices(platform_devs, ARRAY_SIZE(platform_devs));

return parent;
}

/* TODO: Once all pieces are DT:ed, remove completely. */
struct device * __init u8500_of_init_devices(void)
{
struct device *parent;
int i;

parent = db8500_soc_device_init();

db8500_add_rtc(parent);
db8500_add_usb(parent, usb_db8500_rx_dma_cfg, usb_db8500_tx_dma_cfg);

platform_device_register_data(parent,
"cpufreq-u8500", -1, NULL, 0);

Expand Down

0 comments on commit f01acb6

Please sign in to comment.