[U-Boot] [PATCH] imx-common: enlarge mux width to 4

[Peng Fan]

Hi Stefano,

Ping..  I did not see this patch in patchwork (:-

Thanks,
Peng.
On Sun, Sep 18, 2016 at 04:28:28PM +0800, van.freenix at gmail.com wrote:
>From: Peng Fan <peng.fan at nxp.com>
>
>For i.MX6, the mux width is 4, not 3. So enlarge the width.
>IOMUX_CONFIG_LPSR is changed from 0x8 to 0x20 to not use bit 3 of mux.
>
>Signed-off-by: Peng Fan <peng.fan at nxp.com>
>Cc: Stefano Babic <sbabic at denx.de>
>---
> arch/arm/include/asm/imx-common/iomux-v3.h | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
>diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h
>index e0f8350..b3af696 100644
>--- a/arch/arm/include/asm/imx-common/iomux-v3.h
>+++ b/arch/arm/include/asm/imx-common/iomux-v3.h
>@@ -39,10 +39,9 @@
>  * MUX_CTRL_OFS:	    0..11 (12)
>  * PAD_CTRL_OFS:	   12..23 (12)
>  * SEL_INPUT_OFS:	   24..35 (12)
>- * MUX_MODE + SION:	   36..40  (5)
>- * PAD_CTRL + NO_PAD_CTRL: 41..58 (18)
>- * SEL_INP:		   59..62  (4)
>- * reserved:		     63    (1)
>+ * MUX_MODE + SION + LPSR: 36..41  (6)
>+ * PAD_CTRL + NO_PAD_CTRL: 42..59 (18)
>+ * SEL_INP:		   60..63  (4)
> */
> 
> typedef u64 iomux_v3_cfg_t;
>@@ -57,10 +56,10 @@ typedef u64 iomux_v3_cfg_t;
> 	MUX_SEL_INPUT_OFS_SHIFT)
> 
> #define MUX_MODE_SHIFT		36
>-#define MUX_MODE_MASK		((iomux_v3_cfg_t)0x1f << MUX_MODE_SHIFT)
>-#define MUX_PAD_CTRL_SHIFT	41
>+#define MUX_MODE_MASK		((iomux_v3_cfg_t)0x3f << MUX_MODE_SHIFT)
>+#define MUX_PAD_CTRL_SHIFT	42
> #define MUX_PAD_CTRL_MASK	((iomux_v3_cfg_t)0x3ffff << MUX_PAD_CTRL_SHIFT)
>-#define MUX_SEL_INPUT_SHIFT	59
>+#define MUX_SEL_INPUT_SHIFT	60
> #define MUX_SEL_INPUT_MASK	((iomux_v3_cfg_t)0xf << MUX_SEL_INPUT_SHIFT)
> 
> #define MUX_MODE_SION		((iomux_v3_cfg_t)IOMUX_CONFIG_SION << \
>@@ -85,7 +84,7 @@ typedef u64 iomux_v3_cfg_t;
> 
> #define NO_PAD_CTRL		(1 << 17)
> 
>-#define IOMUX_CONFIG_LPSR       0x8
>+#define IOMUX_CONFIG_LPSR       0x20
> #define MUX_MODE_LPSR           ((iomux_v3_cfg_t)IOMUX_CONFIG_LPSR << \
> 				MUX_MODE_SHIFT)
> #ifdef CONFIG_MX7
>-- 
>2.6.2
>