[U-Boot] [PATCH 1/5] imx: mx6: soc: fix mx6sll settings

[Stefano Babic]

On 08/08/2017 10:21, Peng Fan wrote:
> There is not LDO_SOC/PU/ARM/MMDC1 on i.MX6SLL, also no need to gate/ungate
> all PFDs to make PFD working.
> 
> Signed-off-by: Peng Fan <peng.fan at nxp.com>
> Cc: Stefano Babic <sbabic at denx.de>
> Cc: Fabio Estevam <fabio.estevam at nxp.com>
> ---
>  arch/arm/mach-imx/mx6/soc.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
> index af31673..9c3c8dd 100644
> --- a/arch/arm/mach-imx/mx6/soc.c
> +++ b/arch/arm/mach-imx/mx6/soc.c
> @@ -234,6 +234,10 @@ static int set_ldo_voltage(enum ldo_reg ldo, u32 mv)
>  	u32 val, step, old, reg = readl(&anatop->reg_core);
>  	u8 shift;
>  
> +	/* No LDO_SOC/PU/ARM */
> +	if (is_mx6sll())
> +		return 0;
> +
>  	if (mv < 725)
>  		val = 0x00;	/* Power gated off */
>  	else if (mv > 1450)
> @@ -293,7 +297,7 @@ static void clear_mmdc_ch_mask(void)
>  	reg = readl(&mxc_ccm->ccdr);
>  
>  	/* Clear MMDC channel mask */
> -	if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx6sl())
> +	if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx6sl() || is_mx6sll())
>  		reg &= ~(MXC_CCM_CCDR_MMDC_CH1_HS_MASK);
>  	else
>  		reg &= ~(MXC_CCM_CCDR_MMDC_CH1_HS_MASK | MXC_CCM_CCDR_MMDC_CH0_HS_MASK);
> @@ -495,6 +499,10 @@ uint mmc_get_env_part(struct mmc *mmc)
>  
>  int board_postclk_init(void)
>  {
> +	/* NO LDO SOC on i.MX6SLL */
> +	if (is_mx6sll())
> +		return 0;
> +
>  	set_ldo_voltage(LDO_SOC, 1175);	/* Set VDDSOC to 1.175V */
>  
>  	return 0;
> @@ -576,7 +584,7 @@ void s_init(void)
>  	u32 mask528;
>  	u32 reg, periph1, periph2;
>  
> -	if (is_mx6sx() || is_mx6ul() || is_mx6ull())
> +	if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx6sll())
>  		return;
>  
>  	/* Due to hardware limitation, on MX6Q we need to gate/ungate all PFDs
> 
Applied to u-boot-imx, -master, thanks !

Best regards,
Stefano Babic



-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
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
=====================================================================