diff options
author | Ian Molton <spyro@f2s.com> | 2008-08-19 08:34:56 -0400 |
---|---|---|
committer | Ian Molton <spyro@f2s.com> | 2008-08-19 08:44:07 -0400 |
commit | ebcce7b13be837616a3f9d996f637cf3241e3948 (patch) | |
tree | bd4de28ee16e2af9dd94ef5bc3794f0877c31f7a /arch/arm/mach-pxa/e800.c | |
parent | 0ec3cf69304d2e35ad29da3aa9ab43c3dd97677c (diff) |
[ARM] eseries: move UDC defs to machine files
This patchset moves the UDC definitons for e7xx compatible eseries machines
to a common location and moves the 'oddball' e800 definition to its machine
file.
Signed-off-by: Ian Molton <spyro@f2s.com>
Diffstat (limited to 'arch/arm/mach-pxa/e800.c')
-rw-r--r-- | arch/arm/mach-pxa/e800.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/e800.c b/arch/arm/mach-pxa/e800.c index 2f5e9061954b..a293e09bfe25 100644 --- a/arch/arm/mach-pxa/e800.c +++ b/arch/arm/mach-pxa/e800.c | |||
@@ -24,6 +24,8 @@ | |||
24 | 24 | ||
25 | #include <mach/mfp-pxa25x.h> | 25 | #include <mach/mfp-pxa25x.h> |
26 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
27 | #include <mach/eseries-gpio.h> | ||
28 | #include <mach/udc.h> | ||
27 | 29 | ||
28 | #include "generic.h" | 30 | #include "generic.h" |
29 | #include "eseries.h" | 31 | #include "eseries.h" |
@@ -150,6 +152,14 @@ static struct platform_device e800_fb_device = { | |||
150 | .resource = e800_fb_resources, | 152 | .resource = e800_fb_resources, |
151 | }; | 153 | }; |
152 | 154 | ||
155 | /* --------------------------- UDC definitions --------------------------- */ | ||
156 | |||
157 | static struct pxa2xx_udc_mach_info e800_udc_mach_info = { | ||
158 | .gpio_vbus = GPIO_E800_USB_DISC, | ||
159 | .gpio_pullup = GPIO_E800_USB_PULLUP, | ||
160 | .gpio_pullup_inverted = 1 | ||
161 | }; | ||
162 | |||
153 | /* ----------------------------------------------------------------------- */ | 163 | /* ----------------------------------------------------------------------- */ |
154 | 164 | ||
155 | static struct platform_device *devices[] __initdata = { | 165 | static struct platform_device *devices[] __initdata = { |
@@ -159,6 +169,7 @@ static struct platform_device *devices[] __initdata = { | |||
159 | static void __init e800_init(void) | 169 | static void __init e800_init(void) |
160 | { | 170 | { |
161 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 171 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
172 | pxa_set_udc_info(&e800_udc_mach_info); | ||
162 | } | 173 | } |
163 | 174 | ||
164 | MACHINE_START(E800, "Toshiba e800") | 175 | MACHINE_START(E800, "Toshiba e800") |