imx: mx6ull: skip setting ahb clock

[people/ms/u-boot.git] / arch / arm / cpu / armv7 / mx6 / soc.c

diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 88fcfdc2aa61641534e18164af74854942d8cf66..fef4eb72ee273d5c3a58954c004f272c6699d9c2 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -8,7 +8,7 @@
  */
 
 #include <common.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
@@ -343,7 +343,7 @@ int arch_cpu_init(void)
         */
        init_bandgap();
 
-       if (!IS_ENABLED(CONFIG_MX6UL)) {
+       if (!is_mx6ul() && !is_mx6ull()) {
                /*
                 * When low freq boot is enabled, ROM will not set AHB
                 * freq, so we need to ensure AHB freq is 132MHz in such