Skip to contentSkip to conversation

OMAP: Fix copy-paste bug that did not enable UART4 clock

PATCH New Lubomir Popov 3 participants 4 messages Apr 4, 2013 – Apr 8, 2013 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---
 arch/arm/cpu/armv7/omap-common/clocks-common.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/armv7/omap-common/clocks-common.c +2 -2
index 9ed1899..2b955c7 100644
@@ -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);
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/1 OMAP: Fix copy-paste bug that did not enable UART4 clock

Quoted 26 lines · Lubomir Popov

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.

---
 arch/arm/cpu/armv7/omap-common/clocks-common.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/armv7/omap-common/clocks-common.c +1 -1
index 9ed1899..2b955c7 100644
@@ -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) {

arch/arm/cpu/armv7/omap-common/clocks-common.c void setup_clocks_for_console(void) · line 662

Quoted 5 lines
arch/arm/cpu/armv7/omap-common/clocks-common.c +1 -1
@@ -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,

hmm, Thanks for catch.

Regards,
Sricharan

#2 lore raw

PATCH v2 1/1 OMAP: Fix copy-paste bug that did not enable UART4 clock

Quoted 30 lines · Sricharan R
Quoted 29 lines · Lubomir Popov

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.

---
 arch/arm/cpu/armv7/omap-common/clocks-common.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/armv7/omap-common/clocks-common.c +1 -1
index 9ed1899..2b955c7 100644
@@ -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);
 
Quoted 6 lines

arch/arm/cpu/armv7/omap-common/clocks-common.c void setup_clocks_for_console(void) · line 662

Quoted 2 lines
arch/arm/cpu/armv7/omap-common/clocks-common.c +1 -1
-	clrsetbits_le32((*prcm)->cm_l4per_uart3_clkctrl,
+	clrsetbits_le32((*prcm)->cm_l4per_uart4_clkctrl,

hmm, Thanks for catch.

Applied to u-boot-ti/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130408/8c9087d9/attachment.pgp>
#3 lore raw

PATCH v2 1/1 OMAP: Fix copy-paste bug that did not enable UART4 clock

In reply to Lubomir Popov
Quoted 8 lines · Lubomir Popov

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.

Applied to u-boot-ti/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130408/fbce60f9/attachment.pgp>