Skip to content

Commit

Permalink
USB: pxa27x_udc: introduce pxa27x_clear_otgph()
Browse files Browse the repository at this point in the history
Follow pxa27x change in OTGPH handling, and use the newly
defined pxa27x_clear_otgph().

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Eric Miao <eric.miao@marvell.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
  • Loading branch information
David Brownell authored and Greg Kroah-Hartman committed Jun 16, 2009
1 parent 1eba67a commit f6d529f
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions drivers/usb/gadget/pxa27x_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include <linux/usb.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
#include <mach/pxa2xx-regs.h> /* FIXME: for PSSR */
#include <mach/udc.h>

#include "pxa27x_udc.h"
Expand Down Expand Up @@ -2479,6 +2478,12 @@ static void pxa_udc_shutdown(struct platform_device *_dev)
udc_disable(udc);
}

#ifdef CONFIG_CPU_PXA27x
extern void pxa27x_clear_otgph(void);
#else
#define pxa27x_clear_otgph() do {} while (0)
#endif

#ifdef CONFIG_PM
/**
* pxa_udc_suspend - Suspend udc device
Expand Down Expand Up @@ -2546,8 +2551,7 @@ static int pxa_udc_resume(struct platform_device *_dev)
* Software must configure the USB OTG pad, UDC, and UHC
* to the state they were in before entering sleep mode.
*/
if (cpu_is_pxa27x())
PSSR |= PSSR_OTGPH;
pxa27x_clear_otgph();

return 0;
}
Expand Down

0 comments on commit f6d529f

Please sign in to comment.