From 48c56eb32927253c62d9521a5b32f3d6df4805d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
Date: Thu, 13 Jan 2011 14:53:17 +0100
Subject: [PATCH] --- yaml --- r: 232639 b: refs/heads/master c:
 3bb8029a2445e289efade6133b01545143336f70 h: refs/heads/master i:   232637:
 467c8eb18ab9c23d50545ab4795d2ab5d87f5a3e   232635:
 98277f68652949710d56fbe2a0c41979e90108d1   232631:
 4c7ef1c73de14acb87987601b954cdab5811a2eb   232623:
 0a7872dfb2d208b49416a7097b61b082a0409e61   232607:
 c5428721d01ff88a19d3581a340574e13b6ad6c5   232575:
 e24fe51527f732d6ebfd18d42352807ea0e1338c v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/host/ehci-mxc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5c26954dc34d..b97a990f0c9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96a3e79edff6f41b0f115a82f1a39d66218077a7
+refs/heads/master: 3bb8029a2445e289efade6133b01545143336f70
diff --git a/trunk/drivers/usb/host/ehci-mxc.c b/trunk/drivers/usb/host/ehci-mxc.c
index fa59b26fc5bc..d443fbd8535b 100644
--- a/trunk/drivers/usb/host/ehci-mxc.c
+++ b/trunk/drivers/usb/host/ehci-mxc.c
@@ -177,8 +177,8 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
 		clk_enable(priv->ahbclk);
 	}
 
-	/* "dr" device has its own clock */
-	if (pdev->id == 0) {
+	/* "dr" device has its own clock on i.MX51 */
+	if (cpu_is_mx51() && (pdev->id == 0)) {
 		priv->phy1clk = clk_get(dev, "usb_phy1");
 		if (IS_ERR(priv->phy1clk)) {
 			ret = PTR_ERR(priv->phy1clk);