diff mbox

[U-Boot,V0] omap-common: move early UART clock setup to s_init

Message ID 1311844938-17278-2-git-send-email-simonschwarzcor@gmail.com
State Superseded
Headers show

Commit Message

Simon Schwarz July 28, 2011, 9:22 a.m. UTC
Moves the early UART clock setup setup_clocks_for_console() from
preloader_console_init() to s_init() of OMAP4.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
---
 arch/arm/cpu/armv7/omap-common/spl.c |    1 -
 arch/arm/cpu/armv7/omap4/board.c     |    1 +
 2 files changed, 1 insertions(+), 1 deletions(-)

Comments

Andreas Bießmann July 28, 2011, 9:44 a.m. UTC | #1
Hi Simon,

Am 28.07.2011 11:22, schrieb Simon Schwarz:
> Moves the early UART clock setup setup_clocks_for_console() from
> preloader_console_init() to s_init() of OMAP4.

I recommend putting this in your 'devkit8000 nand_spl support' series
before the current '2/5 omap-common: add nand_spl support' and remove
the '#ifdef CONFIG_OMAP34XX' in that patch. Albert how do you think
about this?

> Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
> ---
>  arch/arm/cpu/armv7/omap-common/spl.c |    1 -
>  arch/arm/cpu/armv7/omap4/board.c     |    1 +
>  2 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
> index d177652..d380b3e 100644
> --- a/arch/arm/cpu/armv7/omap-common/spl.c
> +++ b/arch/arm/cpu/armv7/omap-common/spl.c
> @@ -259,7 +259,6 @@ void preloader_console_init(void)

I recommend adding some comment for preloader_console_init() saying
'this requires UART clocks to be enabled before' in this patch.

>  	gd->flags |= GD_FLG_RELOC;
>  	gd->baudrate = CONFIG_BAUDRATE;
>  
> -	setup_clocks_for_console();
>  	serial_init();		/* serial communications setup */
>  
>  	/* Avoid a second "U-Boot" coming from this string */

regards

Andreas Bießmann
Wolfgang Denk July 28, 2011, 1:04 p.m. UTC | #2
Dear Simon Schwarz,

In message <1311844938-17278-2-git-send-email-simonschwarzcor@gmail.com> you wrote:
> Moves the early UART clock setup setup_clocks_for_console() from
> preloader_console_init() to s_init() of OMAP4.
> 
> Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
> ---
>  arch/arm/cpu/armv7/omap-common/spl.c |    1 -
>  arch/arm/cpu/armv7/omap4/board.c     |    1 +
>  2 files changed, 1 insertions(+), 1 deletions(-)

I'm unhappy about the subject.  not to mention again that you posted
another (empty) patch with basicly the same subject line, but you say
"omap-common:" in the subject, while the code looks to be OMAP4
specific?  This is kind of misleading.

Best regards,

Wolfgang Denk
Simon Schwarz July 28, 2011, 2:49 p.m. UTC | #3
Dear Wolfgang Denk,

On 07/28/2011 03:04 PM, Wolfgang Denk wrote:
> Dear Simon Schwarz,
>
> In message<1311844938-17278-2-git-send-email-simonschwarzcor@gmail.com>  you wrote:
>> Moves the early UART clock setup setup_clocks_for_console() from
>> preloader_console_init() to s_init() of OMAP4.
>>
>> Signed-off-by: Simon Schwarz<simonschwarzcor@gmail.com>
>> ---
>>   arch/arm/cpu/armv7/omap-common/spl.c |    1 -
>>   arch/arm/cpu/armv7/omap4/board.c     |    1 +
>>   2 files changed, 1 insertions(+), 1 deletions(-)
>
> I'm unhappy about the subject.  not to mention again that you posted
> another (empty) patch with basicly the same subject line, but you say
> "omap-common:" in the subject, while the code looks to be OMAP4
> specific?  This is kind of misleading.
>
Reason: omap-common because it is a omap-common change - the omap4 part 
is just to fix it up for the SOC which is using it already.

So maybe deleting setup_clocks_for_console() would have been a better 
subject, sorry.

> Best regards,
>
> Wolfgang Denk
>
Regards
Simon Schwarz
Simon Schwarz July 29, 2011, 12:51 p.m. UTC | #4
Hi Andreas,

On 07/28/2011 11:44 AM, Andreas Bießmann wrote:
> Hi Simon,
>
> Am 28.07.2011 11:22, schrieb Simon Schwarz:
>> Moves the early UART clock setup setup_clocks_for_console() from
>> preloader_console_init() to s_init() of OMAP4.
>
> I recommend putting this in your 'devkit8000 nand_spl support' series
> before the current '2/5 omap-common: add nand_spl support' and remove
> the '#ifdef CONFIG_OMAP34XX' in that patch. Albert how do you think
> about this?
>

Since no one objected: I will do this in the next version.

>> Signed-off-by: Simon Schwarz<simonschwarzcor@gmail.com>
>> ---
>>   arch/arm/cpu/armv7/omap-common/spl.c |    1 -
>>   arch/arm/cpu/armv7/omap4/board.c     |    1 +
>>   2 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
>> index d177652..d380b3e 100644
>> --- a/arch/arm/cpu/armv7/omap-common/spl.c
>> +++ b/arch/arm/cpu/armv7/omap-common/spl.c
>> @@ -259,7 +259,6 @@ void preloader_console_init(void)
>
> I recommend adding some comment for preloader_console_init() saying
> 'this requires UART clocks to be enabled before' in this patch.

Will do.

>
>>   	gd->flags |= GD_FLG_RELOC;
>>   	gd->baudrate = CONFIG_BAUDRATE;
>>
>> -	setup_clocks_for_console();
>>   	serial_init();		/* serial communications setup */
>>
>>   	/* Avoid a second "U-Boot" coming from this string */
>
> regards
>
> Andreas Bießmann

Regards
Simon
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index d177652..d380b3e 100644
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -259,7 +259,6 @@  void preloader_console_init(void)
 	gd->flags |= GD_FLG_RELOC;
 	gd->baudrate = CONFIG_BAUDRATE;
 
-	setup_clocks_for_console();
 	serial_init();		/* serial communications setup */
 
 	/* Avoid a second "U-Boot" coming from this string */
diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c
index 5943d61..a9e90de 100644
--- a/arch/arm/cpu/armv7/omap4/board.c
+++ b/arch/arm/cpu/armv7/omap4/board.c
@@ -196,6 +196,7 @@  void s_init(void)
 	watchdog_init();
 	set_mux_conf_regs();
 #ifdef CONFIG_SPL_BUILD
+	setup_clocks_for_console();
 	preloader_console_init();
 #endif
 	prcm_init();