diff options
author | Philipp Zabel <philipp.zabel@gmail.com> | 2008-06-22 18:36:39 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 16:30:13 -0400 |
commit | 7a8576204333d133d58cbcc59dacf49a5546e3e4 (patch) | |
tree | 1d35f2403575953cfab1193381177328ed37ef8a /arch/arm/mach-pxa/pxa25x.c | |
parent | 73d1a2c467ba4fb7420b499b6a7c66edf9626679 (diff) |
[ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC drivers
The pxa2xx_udc.c driver is renamed to pxa25x_udc.c (the platform
driver name changes from pxa2xx-udc to pxa25x-udc) and the
platform driver name of pxa27x_udc.c is fixed to pxa27x-udc.
pxa_device_udc in devices.c is split into pxa25x and pxa27x flavors
and the pxa27x_device_udc is enabled in pxa27x.c.
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Including from Ian Molton:
Fixes for mistakes left over from the PXA2{5,7}X UDC split.
Signed-off-by: Ian Molton <spyro@f2s.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index a1a7dd23ce5a..4cd50e3005e9 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
@@ -127,7 +127,7 @@ static struct clk pxa25x_clks[] = { | |||
127 | INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev), | 127 | INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev), |
128 | INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev), | 128 | INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev), |
129 | INIT_CKEN("UARTCLK", STUART, 14745600, 1, NULL), | 129 | INIT_CKEN("UARTCLK", STUART, 14745600, 1, NULL), |
130 | INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa_device_udc.dev), | 130 | INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa25x_device_udc.dev), |
131 | INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev), | 131 | INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev), |
132 | INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev), | 132 | INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev), |
133 | 133 | ||
@@ -267,7 +267,7 @@ void __init pxa25x_init_irq(void) | |||
267 | } | 267 | } |
268 | 268 | ||
269 | static struct platform_device *pxa25x_devices[] __initdata = { | 269 | static struct platform_device *pxa25x_devices[] __initdata = { |
270 | &pxa_device_udc, | 270 | &pxa25x_device_udc, |
271 | &pxa_device_ffuart, | 271 | &pxa_device_ffuart, |
272 | &pxa_device_btuart, | 272 | &pxa_device_btuart, |
273 | &pxa_device_stuart, | 273 | &pxa_device_stuart, |