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/devices.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/devices.c')
-rw-r--r-- | arch/arm/mach-pxa/devices.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 4a1eebb42e49..123ee19ca795 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c | |||
@@ -93,8 +93,19 @@ static struct resource pxa2xx_udc_resources[] = { | |||
93 | 93 | ||
94 | static u64 udc_dma_mask = ~(u32)0; | 94 | static u64 udc_dma_mask = ~(u32)0; |
95 | 95 | ||
96 | struct platform_device pxa_device_udc = { | 96 | struct platform_device pxa25x_device_udc = { |
97 | .name = "pxa2xx-udc", | 97 | .name = "pxa25x-udc", |
98 | .id = -1, | ||
99 | .resource = pxa2xx_udc_resources, | ||
100 | .num_resources = ARRAY_SIZE(pxa2xx_udc_resources), | ||
101 | .dev = { | ||
102 | .platform_data = &pxa_udc_info, | ||
103 | .dma_mask = &udc_dma_mask, | ||
104 | } | ||
105 | }; | ||
106 | |||
107 | struct platform_device pxa27x_device_udc = { | ||
108 | .name = "pxa27x-udc", | ||
98 | .id = -1, | 109 | .id = -1, |
99 | .resource = pxa2xx_udc_resources, | 110 | .resource = pxa2xx_udc_resources, |
100 | .num_resources = ARRAY_SIZE(pxa2xx_udc_resources), | 111 | .num_resources = ARRAY_SIZE(pxa2xx_udc_resources), |