@@ -199,16 +199,10 @@ if (is_cpu_type(MXC_CPU_MX6Q)) { \
}
#define SETUP_IOMUX_PADS(x) \
imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)/2)
-#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
-#define IOMUX_PADS(x) MX6Q_##x
-#define SETUP_IOMUX_PAD(def) \
- imx_iomux_v3_setup_pad(MX6Q_##def);
-#define SETUP_IOMUX_PADS(x) \
- imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x))
#else
-#define IOMUX_PADS(x) MX6DL_##x
+#define IOMUX_PADS(x) MX6_##x
#define SETUP_IOMUX_PAD(def) \
- imx_iomux_v3_setup_pad(MX6DL_##def);
+ imx_iomux_v3_setup_pad(MX6_##def);
#define SETUP_IOMUX_PADS(x) \
imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x))
#endif
When CONFIG_MX6QDL is undefined, these definitions must be coherent with those in mx6-pins.h. The prefix is MX6 regardless of the type of SoC. Cc: Tim Harvey <tharvey@gateworks.com> Cc: Stefano Babic <sbabic@denx.de> Signed-off-by: Pierre Aubert <p.aubert@staubli.com> --- arch/arm/include/asm/imx-common/iomux-v3.h | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-)