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

Commit 66e56ce7 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

USB: at91_udc wakeup event updates 



This updates the AT91 UDC driver's handling of wakeup events:

 - Fix a bug in the original scheme, which was never updated after
   the {enable,disable}_irq_wake() semantics were updated to address
   refcounting issues (i.e. behave for shared irqs).

 - Couple handling of both type of wakeup events, to be more direct.  The
   controller can be source of wakeup events for cases like bus reset
   and USB resume.  On some boards, VBUS sensing is also IRQ driven.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 57e06c11

drivers/usb/gadget/at91_udc.c

+11 −8
Original line number Diff line number Diff line
@@ -1807,16 +1807,13 @@ static int at91udc_suspend(struct platform_device *pdev, pm_message_t mesg) 
			|| !wake

			|| at91_suspend_entering_slow_clock()) {

		pullup(udc, 0);

		disable_irq_wake(udc->udp_irq);

		wake = 0;

	} else

		enable_irq_wake(udc->udp_irq);



	if (udc->board.vbus_pin > 0) {

		if (wake)

	udc->active_suspend = wake;

	if (udc->board.vbus_pin > 0 && wake)

		enable_irq_wake(udc->board.vbus_pin);

		else

			disable_irq_wake(udc->board.vbus_pin);

	}

	return 0;

}
@@ -1824,7 +1821,13 @@ static int at91udc_resume(struct platform_device *pdev) 
{

	struct at91_udc *udc = platform_get_drvdata(pdev);



	if (udc->board.vbus_pin > 0 && udc->active_suspend)

		disable_irq_wake(udc->board.vbus_pin);



	/* maybe reconnect to host; if so, clocks on */

	if (udc->active_suspend)

		disable_irq_wake(udc->udp_irq);

	else

		pullup(udc, 1);

	return 0;

}

drivers/usb/gadget/at91_udc.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ struct at91_udc { 
	unsigned			wait_for_addr_ack:1;

	unsigned			wait_for_config_ack:1;

	unsigned			selfpowered:1;

	unsigned			active_suspend:1;

	u8				addr;

	struct at91_udc_data		board;

	struct clk			*iclk, *fclk;