From 9d4b4b08b209014faba02d48d0605599e7c679cb Mon Sep 17 00:00:00 2001
From: Richard Zhu <richard.zhu@linaro.org>
Date: Wed, 28 Sep 2011 15:41:57 +0800
Subject: [PATCH] --- yaml --- r: 272671 b: refs/heads/master c:
 d870ea1d6bc5057f2599416655b42ab192dae6d0 h: refs/heads/master i:   272669:
 0cc0b3f9662c804baa5dc087b63cada31343031d   272667:
 cd407bbdf625522b703830dd2188f44c99193720   272663:
 3be90f537b7f14d54ccad1b653732ae6f3286bf3   272655:
 0a944dfe72661a31283badef3ba3eb8be45304ed   272639:
 3d05b2e98aa59135f5aa2c6e3cb0dbf9464105aa v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/arm/mach-mx5/board-mx53_smd.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7ac2e5515a93..81978d79ee5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0661b82c94925fb47708165eaf78cf380b31ffb3
+refs/heads/master: d870ea1d6bc5057f2599416655b42ab192dae6d0
diff --git a/trunk/arch/arm/mach-mx5/board-mx53_smd.c b/trunk/arch/arm/mach-mx5/board-mx53_smd.c
index bc02894eafef..efcab68840ae 100644
--- a/trunk/arch/arm/mach-mx5/board-mx53_smd.c
+++ b/trunk/arch/arm/mach-mx5/board-mx53_smd.c
@@ -35,6 +35,7 @@
 #include "devices-imx53.h"
 
 #define SMD_FEC_PHY_RST		IMX_GPIO_NR(7, 6)
+#define MX53_SMD_SATA_PWR_EN    IMX_GPIO_NR(3, 3)
 
 static iomux_v3_cfg_t mx53_smd_pads[] = {
 	MX53_PAD_CSI0_DAT10__UART1_TXD_MUX,
@@ -111,6 +112,19 @@ static const struct imxi2c_platform_data mx53_smd_i2c_data __initconst = {
 	.bitrate = 100000,
 };
 
+static inline void mx53_smd_ahci_pwr_on(void)
+{
+	int ret;
+
+	/* Enable SATA PWR */
+	ret = gpio_request_one(MX53_SMD_SATA_PWR_EN,
+			GPIOF_DIR_OUT | GPIOF_INIT_HIGH, "ahci-sata-pwr");
+	if (ret) {
+		pr_err("failed to enable SATA_PWR_EN: %d\n", ret);
+		return;
+	}
+}
+
 static void __init mx53_smd_board_init(void)
 {
 	imx53_soc_init();
@@ -125,6 +139,8 @@ static void __init mx53_smd_board_init(void)
 	imx53_add_sdhci_esdhc_imx(0, NULL);
 	imx53_add_sdhci_esdhc_imx(1, NULL);
 	imx53_add_sdhci_esdhc_imx(2, NULL);
+	mx53_smd_ahci_pwr_on();
+	imx53_add_ahci_imx();
 }
 
 static void __init mx53_smd_timer_init(void)