diff options
| author | Tom Rini <trini@ti.com> | 2014-07-02 16:38:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-02 16:38:02 -0400 |
| commit | fe8b3212b7938861eacdefe6115810303a96f9cc (patch) | |
| tree | 281508c9caa5a969597a4dff58d3027337b8759c /arch/arm/imx-common/sata.c | |
| parent | a176ff0705351bf6d993a8f15e081bfa2ba2e1af (diff) | |
| parent | 304f936aeaab0c3cc9d5af438fd3498ac7682991 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/imx-common/sata.c')
| -rw-r--r-- | arch/arm/imx-common/sata.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/imx-common/sata.c b/arch/arm/imx-common/sata.c index 2e694866e0..c10dd28f61 100644 --- a/arch/arm/imx-common/sata.c +++ b/arch/arm/imx-common/sata.c @@ -8,13 +8,18 @@ #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; + 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; |