[U-Boot] [PATCH v2 2/6] arm: mvf600: Add IOMUX support for Vybrid MVF600

[Stefano Babic <sbabic@denx.de>]

On 14/05/2013 11:51, Alison Wang wrote:
> This patch adds the IOMUX support for Vybrid MVF600 platform.
> 
> There is a little difference for IOMUXC module between MVF600 and i.MX
> platform, the muxmode and pad configuration share one 32bit register on
> MVF600, but they are two independent registers on I.MX platform. A
> CONFIG_IOMUX_SHARE_CONFIG_REG was introduced to fit this difference.
> 
> Signed-off-by: Alison Wang <b18965@freescale.com>
> ---
> Changes in v2:
> - Use common iomux-v3 code
> 
>  arch/arm/imx-common/Makefile               |  2 +-
>  arch/arm/imx-common/iomux-v3.c             |  6 ++++++
>  arch/arm/include/asm/imx-common/iomux-v3.h | 18 ++++++++++++++++++
>  3 files changed, 25 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
> index 8bba8a5..3378931 100644
> --- a/arch/arm/imx-common/Makefile
> +++ b/arch/arm/imx-common/Makefile
> @@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
>  
>  LIB     = $(obj)libimx-common.o
>  
> -ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 mx6))
> +ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 mx6 mvf600))
>  COBJS-y	= iomux-v3.o
>  endif
>  ifeq ($(SOC),$(filter $(SOC),mx5 mx6))
> diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c
> index 7fe5ce7..35880c7 100644
> --- a/arch/arm/imx-common/iomux-v3.c
> +++ b/arch/arm/imx-common/iomux-v3.c
> @@ -48,8 +48,14 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
>  	if (sel_input_ofs)
>  		__raw_writel(sel_input, base + sel_input_ofs);
>  
> +#ifdef CONFIG_IOMUX_SHARE_CONF_REG
> +	if (!(pad_ctrl & NO_PAD_CTRL))
> +		__raw_writel((mux_mode << PAD_MUX_MODE_SHIFT) | pad_ctrl,
> +			base + pad_ctrl_ofs);
> +#else
>  	if (!(pad_ctrl & NO_PAD_CTRL) && pad_ctrl_ofs)
>  		__raw_writel(pad_ctrl, base + pad_ctrl_ofs);
> +#endif
>  }
>  
>  void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
> diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h
> index 0b4e763..7005fde 100644
> --- a/arch/arm/include/asm/imx-common/iomux-v3.h
> +++ b/arch/arm/include/asm/imx-common/iomux-v3.h
> @@ -121,6 +121,24 @@ typedef u64 iomux_v3_cfg_t;
>  #define PAD_CTL_DSE_40ohm	(6 << 3)
>  #define PAD_CTL_DSE_34ohm	(7 << 3)
>  
> +#elif defined(CONFIG_MVF600)
> +
> +#define PAD_MUX_MODE_SHIFT      20
> +
> +#define	PAD_CTL_PUS_47K_UP	(1 << 4)
> +#define	PAD_CTL_PUS_100K_UP	(2 << 4)
> +#define PAD_CTL_PUE		(1 << 2)
> +#define PAD_CTL_PKE		(1 << 3)
> +
> +#define PAD_CTL_SPEED_HIGH	(3 << 12)
> +#define PAD_CTL_SPEED_MED	(1 << 12)
> +
> +#define PAD_CTL_DSE_20ohm	(7 << 6)
> +#define PAD_CTL_DSE_25ohm	(6 << 6)
> +#define PAD_CTL_DSE_50ohm	(3 << 6)
> +
> +#define PAD_CTL_OBE_IBE_ENABLE	(3 << 0)
> +
>  #else
>  
>  #define PAD_CTL_DVS		(1 << 13)
> 

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================