diff options
author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2007-12-06 21:18:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 17:34:57 -0500 |
commit | d4a8d46d9129fbb26b4c2d3143b1b0975a9b4ae4 (patch) | |
tree | c8f3df6259f2a2cbcffe559f29fc065c8adcc856 /drivers/usb/gadget | |
parent | 26e109b0a90b5ef7b025e44a969836ab9a598ffc (diff) |
USB: gadget: pxa2xx_udc supports inverted vbus
Some boards (like e.g. Tosa) invert the VBUS-detection signal:
it's low when a host is supplying VBUS, and high otherwise.
Allow specifying whether gpio_vbus value is inverted.
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/pxa2xx_udc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c index 4abf9d26d615..8bd9ce26bd95 100644 --- a/drivers/usb/gadget/pxa2xx_udc.c +++ b/drivers/usb/gadget/pxa2xx_udc.c | |||
@@ -127,8 +127,10 @@ static int is_vbus_present(void) | |||
127 | { | 127 | { |
128 | struct pxa2xx_udc_mach_info *mach = the_controller->mach; | 128 | struct pxa2xx_udc_mach_info *mach = the_controller->mach; |
129 | 129 | ||
130 | if (mach->gpio_vbus) | 130 | if (mach->gpio_vbus) { |
131 | return gpio_get_value(mach->gpio_vbus); | 131 | int value = gpio_get_value(mach->gpio_vbus); |
132 | return mach->gpio_vbus_inverted ? !value : value; | ||
133 | } | ||
132 | if (mach->udc_is_connected) | 134 | if (mach->udc_is_connected) |
133 | return mach->udc_is_connected(); | 135 | return mach->udc_is_connected(); |
134 | return 1; | 136 | return 1; |
@@ -1398,6 +1400,9 @@ static irqreturn_t udc_vbus_irq(int irq, void *_dev) | |||
1398 | struct pxa2xx_udc *dev = _dev; | 1400 | struct pxa2xx_udc *dev = _dev; |
1399 | int vbus = gpio_get_value(dev->mach->gpio_vbus); | 1401 | int vbus = gpio_get_value(dev->mach->gpio_vbus); |
1400 | 1402 | ||
1403 | if (dev->mach->gpio_vbus_inverted) | ||
1404 | vbus = !vbus; | ||
1405 | |||
1401 | pxa2xx_udc_vbus_session(&dev->gadget, vbus); | 1406 | pxa2xx_udc_vbus_session(&dev->gadget, vbus); |
1402 | return IRQ_HANDLED; | 1407 | return IRQ_HANDLED; |
1403 | } | 1408 | } |