On Tuesday 21 April 2009, Robert Jarzmik wrote:
> Follow pxa27x change in OTGPH handling, and use the newly
> defined pxa27x_clear_otgph().
>
> Signed-off-by: Robert Jarzmik <robert.jarzmik@xxxxxxx>
> Acked-by: Eric Miao <eric.miao@xxxxxxxxxxx>
Acked-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
> ---
> drivers/usb/gadget/pxa27x_udc.c | 10 +++++++---
> 1 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
> index 8cc676e..ffe6e0a 100644
> --- a/drivers/usb/gadget/pxa27x_udc.c
> +++ b/drivers/usb/gadget/pxa27x_udc.c
> @@ -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"
> @@ -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
> @@ -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;
> }
> --
> 1.6.2.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
