From 164d98466103a46b7c881149e92ec2a28a6375be Mon Sep 17 00:00:00 2001
From: Giuseppe Pagano <giuseppe.pagano@seco.com>
Date: Thu, 28 Nov 2013 12:32:48 +0100
Subject: nitrogen6x: Move setup_sata to common part

Move setup_sata function definition from platform file nitrogen6x.c
to arch/arm/imx-common/sata.c to avoid code duplication.

Signed-off-by: Giuseppe Pagano <giuseppe.pagano@seco.com>
CC: Stefano Babic <sbabic@denx.de>
CC: Fabio Estevam <fabio.estevam@freescale.com>
CC: Eric Nelson <eric.nelson@boundarydevices.com>
---
 arch/arm/imx-common/sata.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 arch/arm/imx-common/sata.c

(limited to 'arch/arm/imx-common/sata.c')

diff --git a/arch/arm/imx-common/sata.c b/arch/arm/imx-common/sata.c
new file mode 100644
index 000000000..1b4c5029a
--- /dev/null
+++ b/arch/arm/imx-common/sata.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <asm/imx-common/iomux-v3.h>
+#include <asm/arch/iomux.h>
+#include <asm/io.h>
+
+int setup_sata(void)
+{
+	struct iomuxc_base_regs *const iomuxc_regs
+		= (struct iomuxc_base_regs *)IOMUXC_BASE_ADDR;
+
+	int ret = enable_sata_clock();
+	if (ret)
+		return ret;
+
+	clrsetbits_le32(&iomuxc_regs->gpr[13],
+			IOMUXC_GPR13_SATA_MASK,
+			IOMUXC_GPR13_SATA_PHY_8_RXEQ_3P0DB
+			|IOMUXC_GPR13_SATA_PHY_7_SATA2M
+			|IOMUXC_GPR13_SATA_SPEED_3G
+			|(3<<IOMUXC_GPR13_SATA_PHY_6_SHIFT)
+			|IOMUXC_GPR13_SATA_SATA_PHY_5_SS_DISABLED
+			|IOMUXC_GPR13_SATA_SATA_PHY_4_ATTEN_9_16
+			|IOMUXC_GPR13_SATA_PHY_3_TXBOOST_0P00_DB
+			|IOMUXC_GPR13_SATA_PHY_2_TX_1P104V
+			|IOMUXC_GPR13_SATA_PHY_1_SLOW);
+
+	return 0;
+}
-- 
cgit v1.2.3-70-g09d2


From f5514e47c4086d342e81219bb9cbd8956961fa0e Mon Sep 17 00:00:00 2001
From: Stefano Babic <sbabic@denx.de>
Date: Thu, 19 Dec 2013 11:04:33 +0100
Subject: MX6: fix sata compilation for i.MX6

Commit 164d98466103a46b7c881149e92ec2a28a6375be breaks
board with SATA support, because sata is not compiled.

Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 arch/arm/imx-common/Makefile | 2 +-
 arch/arm/imx-common/sata.c   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'arch/arm/imx-common/sata.c')

diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
index 68f0f5276..ee5c872f5 100644
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
@@ -18,7 +18,7 @@ ifeq ($(SOC),$(filter $(SOC),mx6 mxs))
 obj-y	+= misc.o
 endif
 ifeq ($(SOC),$(filter $(SOC),mx6))
-objs-$(CONFIG_CMD_SATA) += sata.o
+obj-$(CONFIG_CMD_SATA) += sata.o
 endif
 obj-$(CONFIG_CMD_BMODE) += cmd_bmode.o
 obj-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o
diff --git a/arch/arm/imx-common/sata.c b/arch/arm/imx-common/sata.c
index 1b4c5029a..2e694866e 100644
--- a/arch/arm/imx-common/sata.c
+++ b/arch/arm/imx-common/sata.c
@@ -7,6 +7,7 @@
 #include <asm/imx-common/iomux-v3.h>
 #include <asm/arch/iomux.h>
 #include <asm/io.h>
+#include <asm/arch/clock.h>
 
 int setup_sata(void)
 {
-- 
cgit v1.2.3-70-g09d2