Commit f6d529f9 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman

USB: pxa27x_udc: introduce pxa27x_clear_otgph()

Follow pxa27x change in OTGPH handling, and use the newly
defined pxa27x_clear_otgph().
Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarEric Miao <eric.miao@marvell.com>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
parent 1eba67a6
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/usb/ch9.h> #include <linux/usb/ch9.h>
#include <linux/usb/gadget.h> #include <linux/usb/gadget.h>
#include <mach/pxa2xx-regs.h> /* FIXME: for PSSR */
#include <mach/udc.h> #include <mach/udc.h>
#include "pxa27x_udc.h" #include "pxa27x_udc.h"
...@@ -2479,6 +2478,12 @@ static void pxa_udc_shutdown(struct platform_device *_dev) ...@@ -2479,6 +2478,12 @@ static void pxa_udc_shutdown(struct platform_device *_dev)
udc_disable(udc); 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 #ifdef CONFIG_PM
/** /**
* pxa_udc_suspend - Suspend udc device * pxa_udc_suspend - Suspend udc device
...@@ -2546,8 +2551,7 @@ static int pxa_udc_resume(struct platform_device *_dev) ...@@ -2546,8 +2551,7 @@ static int pxa_udc_resume(struct platform_device *_dev)
* Software must configure the USB OTG pad, UDC, and UHC * Software must configure the USB OTG pad, UDC, and UHC
* to the state they were in before entering sleep mode. * to the state they were in before entering sleep mode.
*/ */
if (cpu_is_pxa27x()) pxa27x_clear_otgph();
PSSR |= PSSR_OTGPH;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment