Commit 425933b3 authored Jun 24, 2011 by Troy Kisky Committed by Sascha Hauer Jul 07, 2011

MXC: iomux-v3: correct NO_PAD_CTRL definition



iomux-v3.c uses NO_PAD_CTRL as a 32 bit value
so it should not be shifted left by MUX_PAD_CTRL_SHIFT(41)

Previously, anything requesting NO_PAD_CTRL would get
their pad control register set to 0.

Since it is a pad control mask, place it with the other mask values.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Lothar Waßmann <LW@KARO-electronics.de>
Tested-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

parent 429a035d

arch/arm/plat-mxc/include/mach/iomux-v3.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,6 @@ typedef u64 iomux_v3_cfg_t;
		#define MUX_MODE_MASK ((iomux_v3_cfg_t)0x1f << MUX_MODE_SHIFT)
		#define MUX_PAD_CTRL_SHIFT 41
		#define MUX_PAD_CTRL_MASK ((iomux_v3_cfg_t)0x1ffff << MUX_PAD_CTRL_SHIFT)
		#define NO_PAD_CTRL ((iomux_v3_cfg_t)1 << (MUX_PAD_CTRL_SHIFT + 16))
		#define MUX_SEL_INPUT_SHIFT 58
		#define MUX_SEL_INPUT_MASK ((iomux_v3_cfg_t)0xf << MUX_SEL_INPUT_SHIFT)

		@@ -85,6 +84,7 @@ typedef u64 iomux_v3_cfg_t;
		* Use to set PAD control
		*/

		#define NO_PAD_CTRL (1 << 16)
		#define PAD_CTL_DVS (1 << 13)
		#define PAD_CTL_HYS (1 << 8)