karo: tx6: fix duplicate const error

[karo-tx-uboot.git] / arch / arm / include / asm / imx-common / iomux-v3.h

diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h
index 9ba5f6be9622ffe68d0d1c5b7add81e66ca752d6..06a7ed321bf522678e16af6500268c2855b25bfd 100644 (file)
--- a/arch/arm/include/asm/imx-common/iomux-v3.h
+++ b/arch/arm/include/asm/imx-common/iomux-v3.h
@@ -92,7 +92,7 @@ typedef u64 iomux_v3_cfg_t;
 #define __PAD_CTRL_VALID       (1 << 17)
 #define PAD_CTRL_VALID         ((iomux_v3_cfg_t)__PAD_CTRL_VALID << MUX_PAD_CTRL_SHIFT)
 
-#ifdef CONFIG_MX6
+#ifdef CONFIG_ARCH_MX6
 
 #define PAD_CTL_HYS            __MUX_PAD_CTRL(1 << 16)
 
@@ -105,7 +105,7 @@ typedef u64 iomux_v3_cfg_t;
 
 #define PAD_CTL_ODE            __MUX_PAD_CTRL(1 << 11)
 
-#define PAD_CTL_SPEED_LOW      __MUX_PAD_CTRL(1 << 6)
+#define PAD_CTL_SPEED_LOW      __MUX_PAD_CTRL(0 << 6)
 #define PAD_CTL_SPEED_MED      __MUX_PAD_CTRL(2 << 6)
 #define PAD_CTL_SPEED_HIGH     __MUX_PAD_CTRL(3 << 6)
 
@@ -118,12 +118,12 @@ typedef u64 iomux_v3_cfg_t;
 #define PAD_CTL_DSE_40ohm      __MUX_PAD_CTRL(6 << 3)
 #define PAD_CTL_DSE_34ohm      __MUX_PAD_CTRL(7 << 3)
 
-#if defined CONFIG_MX6SL
+#if defined CONFIG_SOC_MX6SL
 #define PAD_CTL_LVE            __MUX_PAD_CTRL(1 << 1)
 #define PAD_CTL_LVE_BIT                __MUX_PAD_CTRL(1 << 22)
 #endif
 
-#elif defined(CONFIG_VF610)
+#elif defined(CONFIG_SOC_VF610)
 
 #define PAD_MUX_MODE_SHIFT     20
 
@@ -133,6 +133,7 @@ typedef u64 iomux_v3_cfg_t;
 #define PAD_CTL_SPEED_HIGH     __MUX_PAD_CTRL(3 << 12)
 
 #define PAD_CTL_SRE            __MUX_PAD_CTRL(1 << 11)
+#define PAD_CTL_ODE            __MUX_PAD_CTRL(1 << 10)
 
 #define PAD_CTL_DSE_150ohm     __MUX_PAD_CTRL(1 << 6)
 #define PAD_CTL_DSE_50ohm      __MUX_PAD_CTRL(3 << 6)
@@ -186,7 +187,7 @@ typedef u64 iomux_v3_cfg_t;
 #define GPIO_PORTE             (4 << GPIO_PORT_SHIFT)
 #define GPIO_PORTF             (5 << GPIO_PORT_SHIFT)
 
-void imx_iomux_v3_setup_pad(const iomux_v3_cfg_t const pad);
+void imx_iomux_v3_setup_pad(const iomux_v3_cfg_t pad);
 void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
                                     unsigned count);
 /*
@@ -194,9 +195,15 @@ void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
 */
 void imx_iomux_set_gpr_register(int group, int start_bit,
                                         int num_bits, int value);
+#ifdef CONFIG_IOMUX_SHARE_CONF_REG
+void imx_iomux_gpio_set_direction(unsigned int gpio,
+                               unsigned int direction);
+void imx_iomux_gpio_get_function(unsigned int gpio,
+                               u32 *gpio_state);
+#endif
 
 /* macros for declaring and using pinmux array */
-#if defined(CONFIG_MX6QDL)
+#if defined(CONFIG_SOC_MX6QDL)
 #define IOMUX_PADS(x) (MX6Q_##x), (MX6DL_##x)
 #define SETUP_IOMUX_PAD(def)                                   \
 if (is_cpu_type(MXC_CPU_MX6Q)) {                               \
@@ -206,7 +213,7 @@ 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)
+#elif defined(CONFIG_SOC_MX6Q) || defined(CONFIG_SOC_MX6D)
 #define IOMUX_PADS(x) MX6Q_##x
 #define SETUP_IOMUX_PAD(def)                                   \
        imx_iomux_v3_setup_pad(MX6Q_##def);