From 66b6c2cf7d3ca64d3cf7b3c16b36d0814bb84a8f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Mon, 8 Jan 2018 12:47:34 +0100 Subject: [PATCH] imx: mx6: align the SPEED_MED setting with the reset default The PAD_CTL SPEED settings 0x1 and 0x2 both designate 'Medium Speed'. The PAD_CTL register HW reset default value is '0x2' for most pads, so use this value for the PAD_CTL_SPEED_MED definition. This partially reverts commit 9b2cc7dbfd46 ("imx: mx6 add PAD_CTL_SPEED_LOW for i.MX6SX/UL") which inadvertently changed the definition from '2' to '1'. --- arch/arm/include/asm/imx-common/iomux-v3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h index 8b9a8070d0..0ef633d07b 100644 --- a/arch/arm/include/asm/imx-common/iomux-v3.h +++ b/arch/arm/include/asm/imx-common/iomux-v3.h @@ -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) -- 2.39.2