imx: mx6: align the SPEED_MED setting with the reset default
authorLothar Waßmann <LW@KARO-electronics.de>
Mon, 8 Jan 2018 11:47:34 +0000 (12:47 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Mon, 8 Jan 2018 11:47:34 +0000 (12:47 +0100)
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

index 8b9a807..0ef633d 100644 (file)
@@ -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)