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-ixp4xx | |
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-ixp4xx')
-rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index f6d66dce6852..3781b3db9f49 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -326,11 +326,11 @@ static struct resource ixp4xx_udc_resources[] = { | |||
326 | }; | 326 | }; |
327 | 327 | ||
328 | /* | 328 | /* |
329 | * USB device controller. The IXP4xx uses the same controller as PXA2XX, | 329 | * USB device controller. The IXP4xx uses the same controller as PXA25X, |
330 | * so we just use the same device. | 330 | * so we just use the same device. |
331 | */ | 331 | */ |
332 | static struct platform_device ixp4xx_udc_device = { | 332 | static struct platform_device ixp4xx_udc_device = { |
333 | .name = "pxa2xx-udc", | 333 | .name = "pxa25x-udc", |
334 | .id = -1, | 334 | .id = -1, |
335 | .num_resources = 2, | 335 | .num_resources = 2, |
336 | .resource = ixp4xx_udc_resources, | 336 | .resource = ixp4xx_udc_resources, |