Merge git://git.denx.de/u-boot-pxa

[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 1b4c5029afbaf2947692476cae7f3042582b6d0e..d174a463f88a70ed8d646a0e1c36e9f833d64e68 100644 (file)
--- a/arch/arm/imx-common/sata.c
+++ b/arch/arm/imx-common/sata.c
@@ -7,13 +7,18 @@
 #include <asm/imx-common/iomux-v3.h>
 #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_cpu_type(MXC_CPU_MX6Q) && !is_cpu_type(MXC_CPU_MX6D))
+               return 1;
+
+       ret = enable_sata_clock();
        if (ret)
                return ret;