summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLubomir Popov <lpopov@mm-sol.com>2013-04-04 05:51:45 +0000
committerTom Rini <trini@ti.com>2013-04-08 11:29:05 -0400
commita8f408a8c4607a63cf2803be205f7350f316f3bc (patch)
treef214639f5bfc2dd356fa428dbc351e27bf8b943d /arch/arm
parent4e7e88d99686d9c308fc5b6125a265dd4bff2f8d (diff)
downloadu-boot-imx-a8f408a8c4607a63cf2803be205f7350f316f3bc.zip
u-boot-imx-a8f408a8c4607a63cf2803be205f7350f316f3bc.tar.gz
u-boot-imx-a8f408a8c4607a63cf2803be205f7350f316f3bc.tar.bz2
OMAP: Fix copy-paste bug that did not enable UART4 clock
V2 fixes line wrap issue of the patch itself. UART3 was enabled twice instead of UART4. One more cosmetic change in a comment on EMIF clock. Signed-off-by: Lubomir Popov <lpopov@mm-sol.com> Reviewed-by: R Sricharan <r.sricharan@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/armv7/omap-common/clocks-common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/clocks-common.c b/arch/arm/cpu/armv7/omap-common/clocks-common.c
index 9ed1899..2b955c7 100644
--- a/arch/arm/cpu/armv7/omap-common/clocks-common.c
+++ b/arch/arm/cpu/armv7/omap-common/clocks-common.c
@@ -612,7 +612,7 @@ void freq_update_core(void)
/*
* Putting EMIF in HW_AUTO is seen to be causing issues with
- * EMIF clocks and the master DLL. Put EMIF in SW_WKUP
+ * EMIF clocks and the master DLL. Keep EMIF in SW_WKUP
* in OMAP5430 ES1.0 silicon
*/
if (omap_rev != OMAP5430_ES1_0) {
@@ -659,7 +659,7 @@ void setup_clocks_for_console(void)
MODULE_CLKCTRL_MODULEMODE_SW_EXPLICIT_EN <<
MODULE_CLKCTRL_MODULEMODE_SHIFT);
- clrsetbits_le32((*prcm)->cm_l4per_uart3_clkctrl,
+ clrsetbits_le32((*prcm)->cm_l4per_uart4_clkctrl,
MODULE_CLKCTRL_MODULEMODE_MASK,
MODULE_CLKCTRL_MODULEMODE_SW_EXPLICIT_EN <<
MODULE_CLKCTRL_MODULEMODE_SHIFT);