Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / arch / arm / imx-common / sata.c

diff --git a/arch/arm/imx-common/sata.c b/arch/arm/imx-common/sata.c
index 2e694866e051948beb2302080bfee5cbd6ced8c7..acf9831870c860fb4137e69b79f5c9524d933f73 100644 (file)
--- a/arch/arm/imx-common/sata.c
+++ b/arch/arm/imx-common/sata.c
@@ -8,13 +8,17 @@
 #include <asm/arch/iomux.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
 
 int setup_sata(void)
 {
-       struct iomuxc_base_regs *const iomuxc_regs
-               = (struct iomuxc_base_regs *)IOMUXC_BASE_ADDR;
+       struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
+       int ret;
 
-       int ret = enable_sata_clock();
+       if (!is_mx6dq() && !is_mx6dqp())
+               return 1;
+
+       ret = enable_sata_clock();
        if (ret)
                return ret;