Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

USB: at91_udc wakeup event updates

Browse Source 
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: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
David Brownell 2007-01-16 12:46:39 -08:00 committed by Greg Kroah-Hartman
parent 57e06c1137
commit 66e56ce75e
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/usb/gadget/at91_udc.c
View File

@ -1807,16 +1807,13 @@ static int at91udc_suspend(struct platform_device *pdev, pm_message_t mesg)
|| !wake || !wake
|| at91_suspend_entering_slow_clock()) { || at91_suspend_entering_slow_clock()) {
pullup(udc, 0); pullup(udc, 0);
disable_irq_wake(udc->udp_irq); wake = 0;
} else } else
enable_irq_wake(udc->udp_irq); enable_irq_wake(udc->udp_irq);
if (udc->board.vbus_pin > 0) { udc->active_suspend = wake;
if (wake) if (udc->board.vbus_pin > 0 && wake)
enable_irq_wake(udc->board.vbus_pin); enable_irq_wake(udc->board.vbus_pin);
else
disable_irq_wake(udc->board.vbus_pin);
}
return 0; return 0;
} }
@ -1824,8 +1821,14 @@ static int at91udc_resume(struct platform_device *pdev)
{ {
struct at91_udc *udc = platform_get_drvdata(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 */ /* maybe reconnect to host; if so, clocks on */
pullup(udc, 1); if (udc->active_suspend)
disable_irq_wake(udc->udp_irq);
else
pullup(udc, 1);
return 0; return 0;
} }
#else #else

1
drivers/usb/gadget/at91_udc.h
View File

@ -136,6 +136,7 @@ struct at91_udc {
unsigned wait_for_addr_ack:1; unsigned wait_for_addr_ack:1;
unsigned wait_for_config_ack:1; unsigned wait_for_config_ack:1;
unsigned selfpowered:1; unsigned selfpowered:1;
unsigned active_suspend:1;
u8 addr; u8 addr;
struct at91_udc_data board; struct at91_udc_data board;
struct clk *iclk, *fclk; struct clk *iclk, *fclk;