From 684958f4162c12b923636f97ce0c5a32747cc62b Mon Sep 17 00:00:00 2001
From: "Ye.Li" <B37916@freescale.com>
Date: Thu, 5 Jun 2014 10:56:30 +0800
Subject: ENGR00315894-17 imx6q:sabresd/sabreauto: add SATA support

This patch adds the SATA support for i.mx6qsabresd and
i.mx6qsabreauto board

Signed-off-by: Jason Liu <r64343@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
---
 board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg  |  4 ++--
 board/freescale/mx6qsabreauto/mx6q.cfg        |  2 +-
 board/freescale/mx6qsabreauto/mx6qsabreauto.c |  7 +++++++
 board/freescale/mx6sabresd/mx6sabresd.c       | 15 +++++++++++----
 4 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'board')

diff --git a/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg b/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
index 5fcae42..8407371 100644
--- a/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
+++ b/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
@@ -132,7 +132,7 @@ DATA 4, 0x020c406c, 0x0030FC03
 DATA 4, 0x020c4070, 0x0FFFC000
 DATA 4, 0x020c4074, 0x3FF00000
 DATA 4, 0x020c4078, 0x00FFF300
-DATA 4, 0x020c407c, 0x0F0000C3
+DATA 4, 0x020c407c, 0x0F0000F3
 DATA 4, 0x020c4080, 0x000003FF
 
 /* enable AXI cache for VDOA/VPU/IPU */
@@ -151,4 +151,4 @@ DATA 4, 0x020e001c, 0x007F007F
  * This sets CKO1 at ahb_clk_root/8 = 132/8 = 16.5 MHz
  */
 DATA 4, 0x020c4060, 0x000000fb
-#endif
\ No newline at end of file
+#endif
diff --git a/board/freescale/mx6qsabreauto/mx6q.cfg b/board/freescale/mx6qsabreauto/mx6q.cfg
index 27cfaee..75ccc24 100644
--- a/board/freescale/mx6qsabreauto/mx6q.cfg
+++ b/board/freescale/mx6qsabreauto/mx6q.cfg
@@ -131,7 +131,7 @@ DATA 4, 0x020c406c, 0x0030FC03
 DATA 4, 0x020c4070, 0x0FFFC000
 DATA 4, 0x020c4074, 0x3FF00000
 DATA 4, 0x020c4078, 0xFFFFF300
-DATA 4, 0x020c407c, 0x0F0000C3
+DATA 4, 0x020c407c, 0x0F0000F3
 DATA 4, 0x020c4080, 0x00000FFF
 
 /* enable AXI cache for VDOA/VPU/IPU */
diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
index 0625a17..0c592fe 100644
--- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c
+++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
@@ -25,6 +25,9 @@
 #include <asm/arch/sys_proto.h>
 #include <i2c.h>
 
+#ifdef CONFIG_CMD_SATA
+#include <asm/imx-common/sata.h>
+#endif
 #ifdef CONFIG_FASTBOOT
 #include <fastboot.h>
 #ifdef CONFIG_ANDROID_RECOVERY
@@ -609,6 +612,10 @@ int board_early_init_f(void)
 #ifdef CONFIG_SYS_USE_NAND
 	setup_gpmi_nand();
 #endif
+
+#ifdef CONFIG_CMD_SATA
+	setup_sata();
+#endif
 	return 0;
 }
 
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index c4c451e..1350e9f 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -33,6 +33,9 @@
 #include <i2c.h>
 #include <asm/imx-common/mxc_i2c.h>
 #endif
+#ifdef CONFIG_CMD_SATA
+#include <asm/imx-common/sata.h>
+#endif
 #ifdef CONFIG_FASTBOOT
 #include <fastboot.h>
 #ifdef CONFIG_ANDROID_RECOVERY
@@ -753,6 +756,14 @@ int board_early_init_f(void)
 	setup_display();
 #endif
 
+#ifdef CONFIG_SYS_USE_SPINOR
+	setup_spinor();
+#endif
+
+#ifdef CONFIG_CMD_SATA
+	setup_sata();
+#endif
+
 	return 0;
 }
 
@@ -761,10 +772,6 @@ int board_init(void)
 	/* address of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
-#ifdef CONFIG_SYS_USE_SPINOR
-	setup_spinor();
-#endif
-
 #if defined(CONFIG_MX6DL) && defined(CONFIG_MXC_EPDC)
 	setup_epdc();
 #endif
-- 
cgit v1.1