X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=arch%2Farm%2Finclude%2Fasm%2Farch-mx6%2Fmx6-pins.h;h=230f1713015a58269a5872169437fc622d1752b0;hp=534f780be8df35d5ed4ca223547919d92043b539;hb=80f0fd8a4e8990ad05261e9d36b6e7e1a4d97245;hpb=5ddc329341a9a143f0567494e5f874008b22e1a7

diff --git a/arch/arm/include/asm/arch-mx6/mx6-pins.h b/arch/arm/include/asm/arch-mx6/mx6-pins.h
index 534f780be8..230f171301 100644
--- a/arch/arm/include/asm/arch-mx6/mx6-pins.h
+++ b/arch/arm/include/asm/arch-mx6/mx6-pins.h
@@ -11,7 +11,7 @@
 #define MX6_PAD_DECLARE(prefix, name, pco, mc, mm, sio, si, pc) \
 	prefix##name = IOMUX_PAD(pco, mc, mm, sio, si, pc)
 
-#ifdef CONFIG_MX6QDL
+#ifdef CONFIG_SOC_MX6QDL
 enum {
 #define MX6_PAD_DECL(name, pco, mc, mm, sio, si, pc) \
 	MX6_PAD_DECLARE(MX6Q_PAD_,name, pco, mc, mm, sio, si, pc),
@@ -21,24 +21,26 @@ enum {
 	MX6_PAD_DECLARE(MX6DL_PAD_,name, pco, mc, mm, sio, si, pc),
 #include "mx6dl_pins.h"
 };
-#elif defined(CONFIG_MX6Q)
+#elif defined(CONFIG_SOC_MX6Q)
 enum {
 #define MX6_PAD_DECL(name, pco, mc, mm, sio, si, pc) \
 	MX6_PAD_DECLARE(MX6_PAD_,name, pco, mc, mm, sio, si, pc),
 #include "mx6q_pins.h"
 };
-#elif defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
+#elif defined(CONFIG_SOC_MX6DL) || defined(CONFIG_SOC_MX6S)
 enum {
 #define MX6_PAD_DECL(name, pco, mc, mm, sio, si, pc) \
 	MX6_PAD_DECLARE(MX6_PAD_,name, pco, mc, mm, sio, si, pc),
 #include "mx6dl_pins.h"
 };
-#elif defined(CONFIG_MX6SL)
+#elif defined(CONFIG_SOC_MX6SL)
 #include "mx6sl_pins.h"
-#elif defined(CONFIG_MX6SX)
+#elif defined(CONFIG_SOC_MX6SX)
 #include "mx6sx_pins.h"
+#elif defined(CONFIG_SOC_MX6UL) || defined(CONFIG_SOC_MX6ULL)
+#include "mx6ul_pins.h"
 #else
 #error "Please select cpu"
-#endif	/* CONFIG_MX6Q */
+#endif	/* CONFIG_SOC_MX6Q */
 
 #endif	/*__ASM_ARCH_MX6_PINS_H__ */