| Message ID | 1336461510-30190-1-git-send-email-eric@eukrea.com |
|---|---|
| State | New |
| Headers | show |
> > this patch gives the possibility to workaround bug ENGcm09152 > on i.MX25 when the hardware workaround is also implemented on > the board. > It covers the workaround described on page 42 of the following Errata, > titled "USB: UTMI_USBPHY VBUS input impedance implementation error" : > http://cache.freescale.com/files/dsp/doc/errata/IMX25CE.pdf > The two patches are ok, I am not sure if sascha is ok for these two as there is cpu_is_xxx code although it is bug fix.
On Wed, May 09, 2012 at 02:59:52AM +0000, Chen Peter-B29397 wrote: > > > > > this patch gives the possibility to workaround bug ENGcm09152 > > on i.MX25 when the hardware workaround is also implemented on > > the board. > > It covers the workaround described on page 42 of the following Errata, > > titled "USB: UTMI_USBPHY VBUS input impedance implementation error" : > > http://cache.freescale.com/files/dsp/doc/errata/IMX25CE.pdf > > > > The two patches are ok, I am not sure if sascha is ok for these two > as there is cpu_is_xxx code although it is bug fix. I am ok with these patches. I think we should try hard and merge the drivers, but this shouldn't be a reason to block bug fixes. Sascha
diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c index dcbc0a2..8bbf673 100644 --- a/drivers/usb/gadget/fsl_mxc_udc.c +++ b/drivers/usb/gadget/fsl_mxc_udc.c @@ -89,17 +89,21 @@ eenahb: void fsl_udc_clk_finalize(struct platform_device *pdev) { struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data; - if (cpu_is_mx35()) { + + /* workaround ENGcm09152 for i.MX25 and i.MX35 */ + if (pdata->workaround & FLS_USB2_WORKAROUND_ENGCM09152) { unsigned int v; + void __iomem *otgbase; - /* workaround ENGcm09152 for i.MX35 */ - if (pdata->workaround & FLS_USB2_WORKAROUND_ENGCM09152) { - v = readl(MX35_IO_ADDRESS(MX35_USB_BASE_ADDR + - USBPHYCTRL_OTGBASE_OFFSET)); - writel(v | USBPHYCTRL_EVDO, - MX35_IO_ADDRESS(MX35_USB_BASE_ADDR + - USBPHYCTRL_OTGBASE_OFFSET)); - } + if (cpu_is_mx25()) + otgbase = MX25_IO_ADDRESS(MX25_USB_BASE_ADDR + + USBPHYCTRL_OTGBASE_OFFSET); + else if (cpu_is_mx35()) + otgbase = MX35_IO_ADDRESS(MX35_USB_BASE_ADDR + + USBPHYCTRL_OTGBASE_OFFSET); + + v = readl(otgbase); + writel(v | USBPHYCTRL_EVDO, otgbase); } /* ULPI transceivers don't need usbpll */
this patch gives the possibility to workaround bug ENGcm09152 on i.MX25 when the hardware workaround is also implemented on the board. It covers the workaround described on page 42 of the following Errata, titled "USB: UTMI_USBPHY VBUS input impedance implementation error" : http://cache.freescale.com/files/dsp/doc/errata/IMX25CE.pdf Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> --- drivers/usb/gadget/fsl_mxc_udc.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-)