linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: eric@eukrea.com (Eric Bénard)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 01/19] mxc_udc: add workaround for ENGcm09152 for i.MX25
Date: Tue, 13 Dec 2011 15:09:37 +0100	[thread overview]
Message-ID: <1323785377-22463-1-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <20111213101846.GC2619@pengutronix.de>

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>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Li Yang <leoli@freescale.com>
---
 drivers/usb/gadget/fsl_mxc_udc.c |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c
index dcbc0a2..4aff05d 100644
--- a/drivers/usb/gadget/fsl_mxc_udc.c
+++ b/drivers/usb/gadget/fsl_mxc_udc.c
@@ -23,7 +23,7 @@
 static struct clk *mxc_ahb_clk;
 static struct clk *mxc_usb_clk;
 
-/* workaround ENGcm09152 for i.MX35 */
+/* workaround ENGcm09152 for i.MX25/35 */
 #define USBPHYCTRL_OTGBASE_OFFSET	0x608
 #define USBPHYCTRL_EVDO			(1 << 23)
 
@@ -89,16 +89,20 @@ eenahb:
 void fsl_udc_clk_finalize(struct platform_device *pdev)
 {
 	struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
-	if (cpu_is_mx35()) {
+	if (cpu_is_mx25() || cpu_is_mx35()) {
 		unsigned int v;
-
-		/* workaround ENGcm09152 for i.MX35 */
+		void __iomem *otgbase;
+		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);
+
+		/* workaround ENGcm09152 for i.MX25/35 */
 		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));
+			v = readl(otgbase);
+			writel(v | USBPHYCTRL_EVDO, otgbase);
 		}
 	}
 
-- 
1.7.6.4

  reply	other threads:[~2011-12-13 14:09 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-13  6:31 [PATCH 01/19] mxc_udc: add workaround for ENGcm09152 for i.MX25 Eric Bénard
2011-12-13  6:31 ` [PATCH 02/19] eukrea_cpuimx25: enable workaround ENGcm09152 Eric Bénard
2011-12-13  6:31 ` [PATCH 03/19] cpuimx25sd: fix Kconfig Eric Bénard
2011-12-13 10:16   ` Wolfram Sang
2011-12-13  6:31 ` [PATCH 04/19] mbimxsd25: add spi controler and spidev support Eric Bénard
2011-12-13 12:39   ` Fabio Estevam
2011-12-13  6:31 ` [PATCH 05/19] cpuimx25: add watchdog support Eric Bénard
2011-12-13  6:31 ` [PATCH 06/19] mx27vis-aic32x4: only register when running on the right machine Eric Bénard
2011-12-13  6:40   ` Mark Brown
2011-12-13  6:31 ` [PATCH 07/19] imx_v4_v5_defconfig: update default configuration Eric Bénard
2011-12-13  6:31 ` [PATCH 08/19] dma: MX3_IPU fix depends Eric Bénard
2011-12-13 10:53   ` Sergei Shtylyov
2011-12-13 13:17     ` Eric Bénard
2011-12-13 12:48   ` Fabio Estevam
2011-12-13 14:12     ` [PATCH v2 " Eric Bénard
2011-12-23 15:45       ` Vinod Koul
2011-12-23 16:04         ` Eric Bénard
2011-12-23 16:14           ` Vinod Koul
2011-12-13  6:31 ` [PATCH 09/19] clock-imx35: fix reboot in internal boot mode Eric Bénard
2011-12-13 10:00   ` [PATCH 09/19] clock-imx35: fix reboot in internal boot modeg Sascha Hauer
2011-12-13 13:47     ` Eric Bénard
2011-12-13 14:13     ` [PATCH v2 09/19] clock-imx35: fix reboot in internal boot mode Eric Bénard
2011-12-13 10:52   ` [PATCH " Sergei Shtylyov
2011-12-13 13:41     ` Eric Bénard
2011-12-13  6:31 ` [PATCH 10/19] wm1133-ev1: only register when running on the right machine Eric Bénard
2011-12-13  6:31 ` [PATCH 11/19] cpuimx35sd: fix Kconfig Eric Bénard
2011-12-13  6:31 ` [PATCH 12/19] cpuimx35: fix touchscreen support Eric Bénard
2011-12-13  6:31 ` [PATCH 13/19] enable uncompress log on cpuimx35sd Eric Bénard
2011-12-13  6:31 ` [PATCH 14/19] mbimxsd35: add spi controler and spidev support Eric Bénard
2011-12-13  6:31 ` [PATCH 15/19] mx3_defconfig: update default configuration Eric Bénard
2011-12-13  6:31 ` [PATCH 16/19] eukrea-cpuimx51: remove board Eric Bénard
2011-12-13 10:05   ` Sascha Hauer
2011-12-13 10:13     ` Eric Bénard
2011-12-15  3:58       ` Amit Kucheria
2011-12-15  6:55         ` Eric Bénard
2011-12-13  6:31 ` [PATCH 17/19] cpuimx51sd: add watchdog support Eric Bénard
2011-12-13  6:31 ` [PATCH 18/19] mbimx51sd: add audio codec support Eric Bénard
2011-12-13  6:31 ` [PATCH 19/19] eukrea-cpuimx51sd: support rev2 PCB Eric Bénard
2011-12-13 10:17 ` [PATCH 01/19] mxc_udc: add workaround for ENGcm09152 for i.MX25 Sascha Hauer
2011-12-13 10:18 ` Wolfram Sang
2011-12-13 14:09   ` Eric Bénard [this message]
2011-12-13 14:18     ` [PATCH v2 " Felipe Balbi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1323785377-22463-1-git-send-email-eric@eukrea.com \
    --to=eric@eukrea.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).