X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=arch%2Farm%2Finclude%2Fasm%2Fimx-common%2Fiomux-v3.h;h=0ef633d07b7e27ae1b20e3f622ea2eda75db9d77;hp=9af5af71c60aa59add64f581eebbaa4613d366a7;hb=66b6c2cf7d3ca64d3cf7b3c16b36d0814bb84a8f;hpb=dfdb35946c027cdebf25c3705b2cce8658f71632

diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h
index 9af5af71c6..0ef633d07b 100644
--- 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_SOC_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)
 
@@ -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)
@@ -194,6 +195,12 @@ 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_SOC_MX6QDL)