diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-12 22:59:50 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-12 23:00:14 (GMT) |
| commit | b22d18c3b412f1a8877c59f043a0a8334d19d50c (patch) | |
| tree | a8c041c84eaa78b5fd804b06ec0123d961174609 /arch/arm/mach-ux500/cpu-db8500.c | |
| parent | a900e5d9971860f2c400ed84d529c891fcd9a3b2 (diff) | |
| parent | 05ec260edecaf3dc214cff49d43b1ad9b2cbb710 (diff) | |
| download | linux-fsl-qoriq-b22d18c3b412f1a8877c59f043a0a8334d19d50c.tar.xz | |
Merge tag 'for-arm-soc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup
From Linus Walleij:
Two fixes for broken <mach/id.h> cleanup.
* tag 'for-arm-soc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
mfd: db8500-prcmu: update resource passing
drivers/db8500-cpufreq: delete dangling include
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-ux500/cpu-db8500.c')
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index d614d71..6f42b60 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -138,14 +138,9 @@ static struct platform_device db8500_pmu_device = { .dev.platform_data = &db8500_pmu_platdata, }; -static struct platform_device db8500_prcmu_device = { - .name = "db8500-prcmu", -}; - static struct platform_device *platform_devs[] __initdata = { &u8500_dma40_device, &db8500_pmu_device, - &db8500_prcmu_device, }; static resource_size_t __initdata db8500_gpio_base[] = { @@ -285,6 +280,8 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("st,nomadik-i2c", 0x80128000, "nmk-i2c.2", NULL), OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL), OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL), + OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", + &db8500_prcmu_pdata), /* Requires device name bindings. */ OF_DEV_AUXDATA("stericsson,nmk_pinctrl", U8500_PRCMU_BASE, "pinctrl-db8500", NULL), |