MLK-18145 imx: Fix wrong pad name prefix

The pads name bind with CONFIG_MX6Q and CONFIG_6DL should start with MX6_PAD
not MX6Q_PAD and MX6DL_PAD. Otherwise we will get build break.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit be7aa84842d9cb4e94f50ff798b6e54712ece89a)
(cherry picked from commit fb8149b20d51381c34877c951cc38a1cc185b5da)
(cherry picked from commit 1e86d97adcab78622c95bdbdef06dcc30dd09d7c)

diff --git a/arch/arm/include/asm/mach-imx/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h
index 1de7093..dd29c70 100644 (file)
--- a/arch/arm/include/asm/mach-imx/iomux-v3.h
+++ b/arch/arm/include/asm/mach-imx/iomux-v3.h
@@ -279,9 +279,9 @@ if (is_mx6dq() || is_mx6dqp()) {                            \
 #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 IOMUX_PADS(x) MX6_##x
 #define SETUP_IOMUX_PAD(def)                                   \
-       imx_iomux_v3_setup_pad(MX6Q_##def);
+       imx_iomux_v3_setup_pad(MX6_##def);
 #define SETUP_IOMUX_PADS(x)                                    \
        imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x))
 #elif defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
@@ -291,9 +291,9 @@ if (is_mx6dq() || is_mx6dqp()) {                            \
 #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