diff options
| author | Peng Fan <peng.fan@nxp.com> | 2016-10-10 10:00:45 +0800 |
|---|---|---|
| committer | Robby Cai <robby.cai@nxp.com> | 2016-11-16 16:57:40 +0800 |
| commit | bdff2ca1b15843fbd1d503cf5137f6815e7a894a (patch) | |
| tree | e8a217cd367a750e499a1f6f35eb5e04e46ea216 | |
| parent | 0b68199affdf943ab19f7c6db85fd066a7f7e670 (diff) | |
| download | u-boot-imx-bdff2ca1b15843fbd1d503cf5137f6815e7a894a.zip u-boot-imx-bdff2ca1b15843fbd1d503cf5137f6815e7a894a.tar.gz u-boot-imx-bdff2ca1b15843fbd1d503cf5137f6815e7a894a.tar.bz2 | |
MLK-13307-7 imx: mx6sll: update soc settings
Update soc settings for i.MX6SLL.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit afa2d78f2b799337eae3dc67c0ed702d5520eee6)
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 424e869..fe67ce0 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -243,6 +243,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_cpu_type(MXC_CPU_MX6SLL)) + return 0; + if (mv < 725) val = 0x00; /* Power gated off */ else if (mv > 1450) @@ -303,7 +307,8 @@ static void clear_mmdc_ch_mask(void) /* Clear MMDC channel mask */ if (is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL) || - is_cpu_type(MXC_CPU_MX6SL) || is_cpu_type(MXC_CPU_MX6ULL)) + is_cpu_type(MXC_CPU_MX6SL) || is_cpu_type(MXC_CPU_MX6ULL) || + is_cpu_type(MXC_CPU_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); @@ -354,6 +359,7 @@ static void init_bandgap(void) } } + #ifdef CONFIG_MX6SL static void set_preclk_from_osc(void) { @@ -475,7 +481,8 @@ static void imx_set_pcie_phy_power_down(void) int arch_cpu_init(void) { if (!is_cpu_type(MXC_CPU_MX6SL) && !is_cpu_type(MXC_CPU_MX6SX) - && !is_cpu_type(MXC_CPU_MX6UL) && !is_cpu_type(MXC_CPU_MX6ULL)) { + && !is_cpu_type(MXC_CPU_MX6UL) && !is_cpu_type(MXC_CPU_MX6ULL) + && !is_cpu_type(MXC_CPU_MX6SLL)) { /* * imx6sl doesn't have pcie at all. * this bit is not used by imx6sx anymore @@ -563,11 +570,11 @@ int arch_cpu_init(void) imx_set_wdog_powerdown(false); /* Disable PDE bit of WMCR register */ if (!is_cpu_type(MXC_CPU_MX6SL) && !is_cpu_type(MXC_CPU_MX6UL) && - !is_cpu_type(MXC_CPU_MX6ULL)) + !is_cpu_type(MXC_CPU_MX6ULL) && !is_cpu_type(MXC_CPU_MX6SLL)) imx_set_pcie_phy_power_down(); if (!is_mx6dqp() && !is_cpu_type(MXC_CPU_MX6UL) && - !is_cpu_type(MXC_CPU_MX6ULL)) + !is_cpu_type(MXC_CPU_MX6ULL) && !is_cpu_type(MXC_CPU_MX6SLL)) imx_set_vddpu_power_down(); #ifdef CONFIG_APBH_DMA @@ -646,6 +653,10 @@ uint mmc_get_env_part(struct mmc *mmc) int board_postclk_init(void) { + /* NO LDO SOC on i.MX6SLL */ + if (is_cpu_type(MXC_CPU_MX6SLL)) + return 0; + set_ldo_voltage(LDO_SOC, 1175); /* Set VDDSOC to 1.175V */ return 0; @@ -803,7 +814,7 @@ void s_init(void) u32 reg, periph1, periph2; if (is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL) || - is_cpu_type(MXC_CPU_MX6ULL)) + is_cpu_type(MXC_CPU_MX6ULL) || is_cpu_type(MXC_CPU_MX6SLL)) return; /* Due to hardware limitation, on MX6Q we need to gate/ungate all PFDs |