From: Tim Harvey <tharvey@gateworks.com>
Date: Thu, 8 May 2014 05:23:35 +0000 (-0700)
Subject: dwc_ahsata: return failure for MX6 if not IMX6Q/IMX6D
X-Git-Tag: v2014.07~5^2~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca84d72d1cfd7629118abce15c0b24cd7413692c;p=oweals%2Fu-boot.git

dwc_ahsata: return failure for MX6 if not IMX6Q/IMX6D

The IMX6QUAD/DUAL have SATA, but the IMX6SOLO/DL do not. Return failure
instead of attempting a memory access that results in a data abort and reset.

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

diff --git a/drivers/block/dwc_ahsata.c b/drivers/block/dwc_ahsata.c
index 3569214297..15d65d77f3 100644
--- a/drivers/block/dwc_ahsata.c
+++ b/drivers/block/dwc_ahsata.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
 #include "dwc_ahsata.h"
 
 struct sata_port_regs {
@@ -558,6 +559,10 @@ int init_sata(int dev)
 	u32 linkmap;
 	struct ahci_probe_ent *probe_ent = NULL;
 
+#if defined(CONFIG_MX6)
+	if (!is_cpu_type(MXC_CPU_MX6Q) && !is_cpu_type(MXC_CPU_MX6D))
+		return 1;
+#endif
 	if (dev < 0 || dev > (CONFIG_SYS_SATA_MAX_DEVICE - 1)) {
 		printf("The sata index %d is out of ranges\n\r", dev);
 		return -1;