Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4a8d46d authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Greg Kroah-Hartman
Browse files

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: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 26e109b0

drivers/usb/gadget/pxa2xx_udc.c

+7 −2
Original line number Diff line number Diff line
@@ -127,8 +127,10 @@ static int is_vbus_present(void) 
{

	struct pxa2xx_udc_mach_info		*mach = the_controller->mach;



	if (mach->gpio_vbus)

		return gpio_get_value(mach->gpio_vbus);

	if (mach->gpio_vbus) {

		int value = gpio_get_value(mach->gpio_vbus);

		return mach->gpio_vbus_inverted ? !value : value;

	}

	if (mach->udc_is_connected)

		return mach->udc_is_connected();

	return 1;
@@ -1398,6 +1400,9 @@ static irqreturn_t udc_vbus_irq(int irq, void *_dev) 
	struct pxa2xx_udc	*dev = _dev;

	int			vbus = gpio_get_value(dev->mach->gpio_vbus);



	if (dev->mach->gpio_vbus_inverted)

		vbus = !vbus;



	pxa2xx_udc_vbus_session(&dev->gadget, vbus);

	return IRQ_HANDLED;

}

include/asm-arm/mach/udc_pxa2xx.h

+2 −0
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ struct pxa2xx_udc_mach_info { 
	 * with on-chip GPIOs not Lubbock's wierd hardware, can have a sane

	 * VBUS IRQ and omit the methods above.  Store the GPIO number

	 * here; for GPIO 0, also mask in one of the pxa_gpio_mode() bits.

	 * Note that sometimes the signals go through inverters...

	 */

	bool	gpio_vbus_inverted;

	u16	gpio_vbus;			/* high == vbus present */

	u16	gpio_pullup;			/* high == pullup activated */

};