diff options
| author | Jun Li <r65092@freescale.com> | 2009-08-20 17:27:30 +0800 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2009-10-13 11:05:25 -0400 |
| commit | 4bbaa26015adef4fb41d89e2aceaf1e6a60513d7 (patch) | |
| tree | e78e3dc8838c0db40238eb59b04fa68f3f1c3a56 /drivers | |
| parent | 31e14669e193ee2e61e437822ed825f89c4ae399 (diff) | |
ENGR00115082 i.MX25 usb gadget driver registration failure.
The registers setting of usb gadget wakeup only added for
i.MX51, which makes gadget driver failed to register on
i.MX25. This patch narrows down usb remote wake up only
for i.MX51.
Signed-off-by: Li Jun <r65092@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/arcotg_udc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/gadget/arcotg_udc.c b/drivers/usb/gadget/arcotg_udc.c index 250d5e9b95ac..7c7af5dfcec0 100644 --- a/drivers/usb/gadget/arcotg_udc.c +++ b/drivers/usb/gadget/arcotg_udc.c @@ -289,6 +289,7 @@ static void dr_wake_up_enable(struct fsl_udc *udc, bool enable) temp &= ~USB_CTRL_OTG_WUIE; fsl_writel(temp, &dr_regs->usbctrl); +#if CONFIG_ARCH_MX51 /* OTG vbus Wakeup disable */ temp = fsl_readl(&dr_regs->uh2ctrl); temp &= ~USB_UH2_OVBWK_EN; @@ -298,10 +299,12 @@ static void dr_wake_up_enable(struct fsl_udc *udc, bool enable) temp = fsl_readl(&dr_regs->phyctrl0); temp &= ~PHY_CTRL0_CONF2; fsl_writel(temp, &dr_regs->phyctrl0); +#endif } else if (device_may_wakeup(&(udc->pdata->pdev->dev))) { temp |= USB_CTRL_OTG_WUIE; fsl_writel(temp, &dr_regs->usbctrl); +#if CONFIG_ARCH_MX51 /* OTG vbus wakeup enable */ temp = fsl_readl(&dr_regs->uh2ctrl); temp |= USB_UH2_OVBWK_EN; @@ -311,6 +314,7 @@ static void dr_wake_up_enable(struct fsl_udc *udc, bool enable) temp = fsl_readl(&dr_regs->phyctrl0); temp |= PHY_CTRL0_CONF2; fsl_writel(temp, &dr_regs->phyctrl0); +#endif } } |