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 /drivers/block/dwc_ahsata.c | |
parent | a176ff0705351bf6d993a8f15e081bfa2ba2e1af (diff) | |
parent | 304f936aeaab0c3cc9d5af438fd3498ac7682991 (diff) | |
download | u-boot-imx-fe8b3212b7938861eacdefe6115810303a96f9cc.zip u-boot-imx-fe8b3212b7938861eacdefe6115810303a96f9cc.tar.gz u-boot-imx-fe8b3212b7938861eacdefe6115810303a96f9cc.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/block/dwc_ahsata.c')
-rw-r--r-- | drivers/block/dwc_ahsata.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/block/dwc_ahsata.c b/drivers/block/dwc_ahsata.c index 3569214..15d65d7 100644 --- a/drivers/block/dwc_ahsata.c +++ b/drivers/block/dwc_ahsata.c @@ -17,6 +17,7 @@ #include <asm/io.h> #include <linux/bitops.h> #include <asm/arch/clock.h> +#include <asm/arch/sys_proto.h> #include "dwc_ahsata.h" struct sata_port_regs { @@ -558,6 +559,10 @@ int init_sata(int dev) u32 linkmap; struct ahci_probe_ent *probe_ent = NULL; +#if defined(CONFIG_MX6) + if (!is_cpu_type(MXC_CPU_MX6Q) && !is_cpu_type(MXC_CPU_MX6D)) + return 1; +#endif if (dev < 0 || dev > (CONFIG_SYS_SATA_MAX_DEVICE - 1)) { printf("The sata index %d is out of ranges\n\r", dev); return -1; |