Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel

Conflicts:
	arch/arm/mach-mx5/clock-mx51-mx53.c
	arch/arm/mach-mx5/devices-imx53.h

1 files changed, 16 insertions, 0 deletions

diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c
index e64fd2c088eb..d12fd3043ba6 100644
--- a/arch/arm/mach-mx5/board-mx53_smd.c
+++ b/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)