aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2007-12-21 04:18:01 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-01 17:34:59 -0500
commit487dc9225a8e7cc522177316abee7b1e272a2863 (patch)
treebc919d87b702c22b0b4c6b8471aebd0680e91801 /arch/arm/mach-pxa
parente057a35aa140b5e5d01603f78845ad328dde302a (diff)
USB: tosa_udc_use_gpio_vbus.patch
Use gpio_vbus instead of udc_is_connected for udc on tosa. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/tosa.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 1919756900f4..1a9c844ac7eb 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -157,15 +157,10 @@ static void tosa_udc_command(int cmd)
157 } 157 }
158} 158}
159 159
160static int tosa_udc_is_connected(void)
161{
162 return ((GPLR(TOSA_GPIO_USB_IN) & GPIO_bit(TOSA_GPIO_USB_IN)) == 0);
163}
164
165
166static struct pxa2xx_udc_mach_info udc_info __initdata = { 160static struct pxa2xx_udc_mach_info udc_info __initdata = {
167 .udc_command = tosa_udc_command, 161 .udc_command = tosa_udc_command,
168 .udc_is_connected = tosa_udc_is_connected, 162 .gpio_vbus = TOSA_GPIO_USB_IN,
163 .gpio_vbus_inverted = 1,
169}; 164};
170 165
171/* 166/*