diff options
| author | Anson Huang <b20788@freescale.com> | 2014-01-23 14:00:19 +0800 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-02-11 11:24:01 +0100 |
| commit | 16197bb8ba5962ab3a9c065c06c91c8c288c0f8e (patch) | |
| tree | 4b5e3531492ecb608351a1e109373bfa10fd6151 /arch/arm/cpu/armv7/mx6 | |
| parent | 5c92edc21c3e12873cd3de5ed73d85d48b8828ac (diff) | |
| download | blackbird-obmc-uboot-16197bb8ba5962ab3a9c065c06c91c8c288c0f8e.tar.gz blackbird-obmc-uboot-16197bb8ba5962ab3a9c065c06c91c8c288c0f8e.zip | |
imx6: make sure MMDC_CHx_MASK is clear to avoid warm reset failure
Boot ROM may mask MMDC_CHx_MASK in CCM_CCDR(such as i.MX6SL TO1.2),
it will cause warm reset fail, need to clear this MMDC_CHx_MASK field
to make sure all the i.MX6 series SOCs reset function work. Otherwise,
uboot "reset" command will fail, tested on i.MX6SL EVK board with TO1.2.
Signed-off-by: Anson Huang <b20788@freescale.com>
Diffstat (limited to 'arch/arm/cpu/armv7/mx6')
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 33a2939415..2aad0a15bb 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -189,10 +189,21 @@ static void set_ahb_rate(u32 val) (div << MXC_CCM_CBCDR_AHB_PODF_OFFSET), &mxc_ccm->cbcdr); } +static void clear_mmdc_ch_mask(void) +{ + struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; + + /* Clear MMDC channel mask */ + writel(0, &mxc_ccm->ccdr); +} + int arch_cpu_init(void) { init_aips(); + /* Need to clear MMDC_CHx_MASK to make warm reset work. */ + clear_mmdc_ch_mask(); + /* * When low freq boot is enabled, ROM will not set AHB * freq, so we need to ensure AHB freq is 132MHz in such |
