diff mbox

[U-Boot,1/1] imx: iomux: fix incorrect reference of pad names in macros

Message ID 1413523088.28333.13.camel@edward-MS-7751
State Not Applicable
Delegated to: Stefano Babic
Headers show

Commit Message

Edward Lin Oct. 17, 2014, 5:18 a.m. UTC 
MX6 reference pad names MX6Q_PAD_xx/MX6DL_PAD_xx when CONFIG_MX6QDL,
while other cases reference MX6_PAD_xx only.

Cc: Tim Harvey <tharvey@gateworks.com>

Signed-off-by: Edward Lin <tungyilin1127@gmail.com>
---
 arch/arm/include/asm/imx-common/iomux-v3.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h
b/arch/arm/include/asm/imx-common/iomux-v3.h
index 70ee86c..00c7eeb 100644
--- a/arch/arm/include/asm/imx-common/iomux-v3.h
+++ b/arch/arm/include/asm/imx-common/iomux-v3.h
@@ -192,16 +192,17 @@  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
+#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)		\
+	|| defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
+#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))
 #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