From: Ranjani Vaidyanathan <ra5478@freescale.com>
Date: Mon, 16 Apr 2012 18:30:36 +0000 (-0500)
Subject: ENGR00179747: MX6DL-Fix boot failure
X-Git-Tag: v3.0.35-fsl~1176
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bd2724c159e09622e2578e002e1975cf657f2fb7;p=karo-tx-linux.git

ENGR00179747: MX6DL-Fix boot failure

Fix the boot failure caused by:
8f0c21e06d4f7d0c7c078d6261ccd75f2a45c3ab
MX6- Add bus frequency scaling support

There is no SATA on MX6DL. Accessing SATA PHYs early in the boot
process causes the system to crash.

Signed-off-by: Ranjani Vaidyanathan <ra5478@freescale.com>
---

diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c
index 47ee9b7956ae..a5b22d8dd34d 100644
--- a/arch/arm/mach-mx6/clock.c
+++ b/arch/arm/mach-mx6/clock.c
@@ -5297,10 +5297,12 @@ int __init mx6_clocks_init(unsigned long ckil, unsigned long osc,
 	lp_med_freq = 0;
 
 	/* Turn OFF all unnecessary PHYs. */
-	/* Turn off SATA PHY. */
-	base = ioremap(MX6Q_SATA_BASE_ADDR, SZ_8K);
-	reg = __raw_readl(base + PORT_PHY_CTL);
-	__raw_writel(reg | PORT_PHY_CTL_PDDQ_LOC, base + PORT_PHY_CTL);
+	if (cpu_is_mx6q()) {
+		/* Turn off SATA PHY. */
+		base = ioremap(MX6Q_SATA_BASE_ADDR, SZ_8K);
+		reg = __raw_readl(base + PORT_PHY_CTL);
+		__raw_writel(reg | PORT_PHY_CTL_PDDQ_LOC, base + PORT_PHY_CTL);
+	}
 
 	/* Turn off HDMI PHY. */
 	base = ioremap(MX6Q_HDMI_ARB_BASE_ADDR, SZ_128K);