Patchwork [U-Boot,v2] OMAP: Fix copy-paste bug that did not enable UART4 clock

login
register
mail settings
Submitter Lubomir Popov
Date April 4, 2013, 3:51 p.m.
Message ID <515DA191.0@mm-sol.com>
Download mbox | patch
Permalink /patch/233866/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Lubomir Popov - April 4, 2013, 3:51 p.m.
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>

---
 arch/arm/cpu/armv7/omap-common/clocks-common.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
SRICHARAN R - April 8, 2013, 6:06 a.m.
On Thursday 04 April 2013 09:21 PM, Lubomir Popov wrote:
> 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>
> 
> ---
>  arch/arm/cpu/armv7/omap-common/clocks-common.c |    4 ++--
>  1 file 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,

hmm, Thanks for catch.

Reviewed-by: R Sricharan <r.sricharan@ti.com>

Regards,
 Sricharan
Tom Rini - April 8, 2013, 4:55 p.m.
On Mon, Apr 08, 2013 at 11:36:29AM +0530, Sricharan R wrote:

> On Thursday 04 April 2013 09:21 PM, Lubomir Popov wrote:
> > 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>
> > 
> > ---
> >  arch/arm/cpu/armv7/omap-common/clocks-common.c |    4 ++--
> >  1 file 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,
> 
> hmm, Thanks for catch.
> 
> Reviewed-by: R Sricharan <r.sricharan@ti.com>

Applied to u-boot-ti/master, thanks!
Tom Rini - April 8, 2013, 4:57 p.m.
On Thu, Apr 04, 2013 at 05:51:45AM -0000, Lubomir Popov wrote:

> 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>

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

Patch

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);