Patchwork [U-Boot,3/8] Fix compile problem for some boards in the clock code.

login
register
mail settings
Submitter Alex
Date June 30, 2011, 7:33 p.m.
Message ID <1309462387-22926-4-git-send-email-awaterman@dawning.com>
Download mbox | patch
Permalink /patch/102812/
State Changes Requested
Delegated to: Reinhard Meyer
Headers show

Comments

Alex - June 30, 2011, 7:33 p.m.
Some boards use AT91_SLOW_CLOCK and other use
CONFIG_SYS_AT91_SLOW_CLOCK. This patch makes it so the arm926ejs
clock code will return which ever is set.

Signed-off-by: Alex Waterman <awaterman@dawning.com>
---
 arch/arm/cpu/arm926ejs/at91/clock.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
Reinhard Meyer - July 4, 2011, 7:37 a.m.
Dear Alex Waterman,
> Some boards use AT91_SLOW_CLOCK and other use
> CONFIG_SYS_AT91_SLOW_CLOCK. This patch makes it so the arm926ejs
> clock code will return which ever is set.
> 
> Signed-off-by: Alex Waterman <awaterman@dawning.com>
> ---
>  arch/arm/cpu/arm926ejs/at91/clock.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/cpu/arm926ejs/at91/clock.c b/arch/arm/cpu/arm926ejs/at91/clock.c
> index 608af2c..0083bd2 100644
> --- a/arch/arm/cpu/arm926ejs/at91/clock.c
> +++ b/arch/arm/cpu/arm926ejs/at91/clock.c
> @@ -57,7 +57,11 @@ static unsigned long at91_css_to_rate(unsigned long css)
>  {
>  	switch (css) {
>  	case AT91_PMC_MCKR_CSS_SLOW:
> +#ifdef AT91_SLOW_CLOCK
> +		return AT91_SLOW_CLOCK;
> +#else
>  		return CONFIG_SYS_AT91_SLOW_CLOCK;
> +#endif
>  	case AT91_PMC_MCKR_CSS_MAIN:
>  		return gd->main_clk_rate_hz;
>  	case AT91_PMC_MCKR_CSS_PLLA:

NAK. "Compile problems" for some boards shall not be fixed by hacks
into common source. Fix the board's definition file instead.

Best Regards,
Reinhard

Patch

diff --git a/arch/arm/cpu/arm926ejs/at91/clock.c b/arch/arm/cpu/arm926ejs/at91/clock.c
index 608af2c..0083bd2 100644
--- a/arch/arm/cpu/arm926ejs/at91/clock.c
+++ b/arch/arm/cpu/arm926ejs/at91/clock.c
@@ -57,7 +57,11 @@  static unsigned long at91_css_to_rate(unsigned long css)
 {
 	switch (css) {
 	case AT91_PMC_MCKR_CSS_SLOW:
+#ifdef AT91_SLOW_CLOCK
+		return AT91_SLOW_CLOCK;
+#else
 		return CONFIG_SYS_AT91_SLOW_CLOCK;
+#endif
 	case AT91_PMC_MCKR_CSS_MAIN:
 		return gd->main_clk_rate_hz;
 	case AT91_PMC_MCKR_CSS_PLLA: