summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/devices.c
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2009-05-26 22:03:32 +0200
committerEric Miao <eric.miao@marvell.com>2009-06-04 11:06:25 +0800
commit1257629b0712a0a68a24c532a05a4cd23e3f7565 (patch)
treed5b7a005b386a02ea94091c9c2e69920bbc8cb74 /arch/arm/mach-pxa/devices.c
parentd81e77f041881d8d91c767b8c84f9068290b10c6 (diff)
downloadop-kernel-dev-1257629b0712a0a68a24c532a05a4cd23e3f7565.zip
op-kernel-dev-1257629b0712a0a68a24c532a05a4cd23e3f7565.tar.gz
[ARM] pxa: fix pxa27x_udc default pullup GPIO
Currently, pxa27x_udc tries to use GPIO 0 as D+ pullup if not explicitly configured. Default to an invalid GPIO (-1) instead. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/devices.c')
-rw-r--r--arch/arm/mach-pxa/devices.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index d245e59c..29970f7 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -72,7 +72,10 @@ void __init pxa_set_mci_info(struct pxamci_platform_data *info)
}
-static struct pxa2xx_udc_mach_info pxa_udc_info;
+static struct pxa2xx_udc_mach_info pxa_udc_info = {
+ .gpio_pullup = -1,
+ .gpio_vbus = -1,
+};
void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info)
{
OpenPOWER on IntegriCloud