diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-03 10:32:24 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-03 10:32:24 -0500 |
| commit | f1993ca066100fcaba7d49fecae0ef604e5807e2 (patch) | |
| tree | 5439c5cdd14b34ff2085b4876472a44349c15843 /arch/arm/cpu/armv7 | |
| parent | d83c25c318564080ce647795e5ee49133b97e87d (diff) | |
| parent | ccf4326bac0371774265be0a8b13c150b445e703 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/cpu/armv7')
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/clock.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/ddr.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index d325191606..64514b1634 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -727,6 +727,8 @@ int enable_lcdif_clock(u32 base_addr) reg = readl(&imx_ccm->CCGR2); reg |= MXC_CCM_CCGR2_LCD_MASK; writel(reg, &imx_ccm->CCGR2); + + return 0; } #endif diff --git a/arch/arm/cpu/armv7/mx6/ddr.c b/arch/arm/cpu/armv7/mx6/ddr.c index 6b039e4531..567ddc4bdd 100644 --- a/arch/arm/cpu/armv7/mx6/ddr.c +++ b/arch/arm/cpu/armv7/mx6/ddr.c @@ -796,7 +796,6 @@ void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo, debug("Rtt_wr=%d\n", sysinfo->rtt_wr); debug("Rtt_nom=%d\n", sysinfo->rtt_nom); debug("SRT=%d\n", ddr3_cfg->SRT); - debug("tcl=%d\n", tcl); debug("twr=%d\n", twr); /* |