Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303228
b: refs/heads/master
c: 08d0502
h: refs/heads/master
v: v3
  • Loading branch information
Lee Jones authored and Linus Walleij committed May 1, 2012
1 parent b401acb commit ce78f9b
Show file tree
Hide file tree
Showing 2 changed files with 16 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: 4809f90aadb299743b8f8021ff386f0ef0392c86
refs/heads/master: 08d050263190174914951a158ddf759177a58039
18 changes: 15 additions & 3 deletions trunk/arch/arm/mach-ux500/cpu-db8500.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ static struct platform_device *platform_devs[] __initdata = {
&db8500_prcmu_device,
};

static struct platform_device *of_platform_devs[] __initdata = {
&u8500_dma40_device,
&db8500_pmu_device,
&db8500_prcmu_device,
};

static resource_size_t __initdata db8500_gpio_base[] = {
U8500_GPIOBANK0_BASE,
U8500_GPIOBANK1_BASE,
Expand Down Expand Up @@ -199,10 +205,16 @@ struct device * __init u8500_init_devices(void)
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;
for (i = 0; i < ARRAY_SIZE(of_platform_devs); i++)
of_platform_devs[i]->dev.parent = parent;

platform_add_devices(platform_devs, ARRAY_SIZE(platform_devs));
/*
* Devices to be DT:ed:
* u8500_dma40_device = todo
* db8500_pmu_device = todo
* db8500_prcmu_device = todo
*/
platform_add_devices(of_platform_devs, ARRAY_SIZE(of_platform_devs));

return parent;
}

0 comments on commit ce78f9b

Please sign in to comment.