From: Tim Harvey <tharvey@gateworks.com>
Date: Thu, 8 May 2014 05:24:47 +0000 (-0700)
Subject: imx: sata: return failure if not IMX6Q/IMX6D
X-Git-Tag: v2014.07~10^2~21
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=22452fd821300ef715c2c9d62ea466767e5eafd3

imx: sata: return failure if not IMX6Q/IMX6D

The IMX6QUAD/DUAL have SATA, but the IMX6SOLO/DL do not. Return
instead of configuring the SATA clock and GPR13 registers.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
---

diff --git a/arch/arm/imx-common/sata.c b/arch/arm/imx-common/sata.c
index 2e694866e0..c10dd28f61 100644
--- a/arch/arm/imx-common/sata.c
+++ b/arch/arm/imx-common/sata.c
@@ -8,13 +8,18 @@
 #include <asm/arch/iomux.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
 
 int setup_sata(void)
 {
 	struct iomuxc_base_regs *const iomuxc_regs
 		= (struct iomuxc_base_regs *)IOMUXC_BASE_ADDR;
+	int ret;
 
-	int ret = enable_sata_clock();
+	if (!is_cpu_type(MXC_CPU_MX6Q) && !is_cpu_type(MXC_CPU_MX6D))
+		return 1;
+
+	ret = enable_sata_clock();
 	if (ret)
 		return ret;