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=06a7ed321bf522678e16af6500268c2855b25bfd;hp=e1b733741bf7e1cd8883ba61b8fb4d7c4f486f4f;hb=75ed2c2289f7214c20aea82d6fd3d4c905d0b596;hpb=9b2cc7dbfd46b61f9f44cbfe3eb10d5478e152d1

diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h
index e1b733741b..06a7ed321b 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)
 
@@ -106,7 +106,7 @@ typedef u64 iomux_v3_cfg_t;
 #define PAD_CTL_ODE		__MUX_PAD_CTRL(1 << 11)
 
 #define PAD_CTL_SPEED_LOW	__MUX_PAD_CTRL(0 << 6)
-#define PAD_CTL_SPEED_MED	__MUX_PAD_CTRL(1 << 6)
+#define PAD_CTL_SPEED_MED	__MUX_PAD_CTRL(2 << 6)
 #define PAD_CTL_SPEED_HIGH	__MUX_PAD_CTRL(3 << 6)
 
 #define PAD_CTL_DSE_DISABLE	__MUX_PAD_CTRL(0 << 3)
@@ -187,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);
 /*