arm,imx6: fix PAD_CTL_SPEED_LOW constant

[u-boot] / arch / arm / include / asm / mach-imx / iomux-v3.h

diff --git a/arch/arm/include/asm/mach-imx/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h
index ad35e0109e4da897d2fe9bfd69f4121a1eee139a..09094c9af69a16d62425cc363536cef2ee291fe5 100644 (file)
--- a/arch/arm/include/asm/mach-imx/iomux-v3.h
+++ b/arch/arm/include/asm/mach-imx/iomux-v3.h
@@ -87,7 +87,27 @@ typedef u64 iomux_v3_cfg_t;
 #define IOMUX_CONFIG_LPSR       0x20
 #define MUX_MODE_LPSR           ((iomux_v3_cfg_t)IOMUX_CONFIG_LPSR << \
                                MUX_MODE_SHIFT)
-#ifdef CONFIG_MX7
+#ifdef CONFIG_MX8M
+#define PAD_CTL_DSE0           (0x0 << 0)
+#define PAD_CTL_DSE1           (0x1 << 0)
+#define PAD_CTL_DSE2           (0x2 << 0)
+#define PAD_CTL_DSE3           (0x3 << 0)
+#define PAD_CTL_DSE4           (0x4 << 0)
+#define PAD_CTL_DSE5           (0x5 << 0)
+#define PAD_CTL_DSE6           (0x6 << 0)
+#define PAD_CTL_DSE7           (0x7 << 0)
+
+#define PAD_CTL_FSEL0          (0x0 << 3)
+#define PAD_CTL_FSEL1          (0x1 << 3)
+#define PAD_CTL_FSEL2          (0x2 << 3)
+#define PAD_CTL_FSEL3          (0x3 << 3)
+
+#define PAD_CTL_ODE            (0x1 << 5)
+#define PAD_CTL_PUE            (0x1 << 6)
+#define PAD_CTL_HYS            (0x1 << 7)
+#define PAD_CTL_LVTTL          (0x1 << 8)
+
+#elif defined CONFIG_MX7
 
 #define IOMUX_LPSR_SEL_INPUT_OFS 0x70000
 
@@ -127,10 +147,10 @@ typedef u64 iomux_v3_cfg_t;
 
 #define PAD_CTL_ODE            (1 << 11)
 
-#if defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL)
-#define PAD_CTL_SPEED_LOW      (0 << 6)
-#else
+#if defined(CONFIG_MX6SL)
 #define PAD_CTL_SPEED_LOW      (1 << 6)
+#else
+#define PAD_CTL_SPEED_LOW      (0 << 6)
 #endif
 #define PAD_CTL_SPEED_MED      (2 << 6)
 #define PAD_CTL_SPEED_HIGH     (3 << 6)
@@ -240,7 +260,7 @@ void imx_iomux_gpio_get_function(unsigned int gpio,
 #if defined(CONFIG_MX6QDL)
 #define IOMUX_PADS(x) (MX6Q_##x), (MX6DL_##x)
 #define SETUP_IOMUX_PAD(def)                                   \
-if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) {                          \
+if (is_mx6dq() || is_mx6dqp()) {                               \
        imx_iomux_v3_setup_pad(MX6Q_##def);                     \
 } else {                                                       \
        imx_iomux_v3_setup_pad(MX6DL_##def);                    \
@@ -253,7 +273,7 @@ if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) {                               \
        imx_iomux_v3_setup_pad(MX6Q_##def);
 #define SETUP_IOMUX_PADS(x)                                    \
        imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x))
-#elif defined(CONFIG_MX6UL)
+#elif defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
 #define IOMUX_PADS(x) MX6_##x
 #define SETUP_IOMUX_PAD(def)                                   \
        imx_iomux_v3_setup_pad(MX6_##def);