aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/e800.c
diff options
context:
space:
mode:
authorIan Molton <spyro@f2s.com>2008-08-19 13:34:56 +0100
committerIan Molton <spyro@f2s.com>2008-08-19 13:44:07 +0100
commitebcce7b13be837616a3f9d996f637cf3241e3948 (patch)
treebd4de28ee16e2af9dd94ef5bc3794f0877c31f7a /arch/arm/mach-pxa/e800.c
parent[ARM] eseries: move LCD defs into machine files (diff)
downloadlinux-dev-ebcce7b13be837616a3f9d996f637cf3241e3948.tar.xz
linux-dev-ebcce7b13be837616a3f9d996f637cf3241e3948.zip
[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.c11
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 @@
#include <mach/mfp-pxa25x.h>
#include <mach/hardware.h>
+#include <mach/eseries-gpio.h>
+#include <mach/udc.h>
#include "generic.h"
#include "eseries.h"
@@ -150,6 +152,14 @@ static struct platform_device e800_fb_device = {
.resource = e800_fb_resources,
};
+/* --------------------------- UDC definitions --------------------------- */
+
+static struct pxa2xx_udc_mach_info e800_udc_mach_info = {
+ .gpio_vbus = GPIO_E800_USB_DISC,
+ .gpio_pullup = GPIO_E800_USB_PULLUP,
+ .gpio_pullup_inverted = 1
+};
+
/* ----------------------------------------------------------------------- */
static struct platform_device *devices[] __initdata = {
@@ -159,6 +169,7 @@ static struct platform_device *devices[] __initdata = {
static void __init e800_init(void)
{
platform_add_devices(devices, ARRAY_SIZE(devices));
+ pxa_set_udc_info(&e800_udc_mach_info);
}
MACHINE_START(E800, "Toshiba e800")