diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2007-12-21 12:18:01 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 14:34:59 -0800 |
| commit | 487dc9225a8e7cc522177316abee7b1e272a2863 (patch) | |
| tree | bc919d87b702c22b0b4c6b8471aebd0680e91801 /arch | |
| parent | e057a35aa140b5e5d01603f78845ad328dde302a (diff) | |
| download | kernel-crypto-487dc9225a8e7cc522177316abee7b1e272a2863.tar.gz kernel-crypto-487dc9225a8e7cc522177316abee7b1e272a2863.tar.xz kernel-crypto-487dc9225a8e7cc522177316abee7b1e272a2863.zip | |
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')
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 1919756900f..1a9c844ac7e 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) } } -static int tosa_udc_is_connected(void) -{ - return ((GPLR(TOSA_GPIO_USB_IN) & GPIO_bit(TOSA_GPIO_USB_IN)) == 0); -} - - static struct pxa2xx_udc_mach_info udc_info __initdata = { .udc_command = tosa_udc_command, - .udc_is_connected = tosa_udc_is_connected, + .gpio_vbus = TOSA_GPIO_USB_IN, + .gpio_vbus_inverted = 1, }; /* |