Le jeudi 06 novembre 2008 à 20:29 +0100, Jean-Christophe
PLAGNIOL-VILLARD a écrit :
On 18:07 Tue 21 Oct , Stelian Pop wrote:
Introduce AT91_CPU_CLOCK and use it for displaying the CPU
speed in the LCD driver.
Also make AT91_MAIN_CLOCK and AT91_MASTER_CLOCK reflect the
corresponding board clocks.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
common/lcd.c|2 +-
include/configs/at91cap9adk.h |5 +++--
include/configs/at91sam9260ek.h |6 --
include/configs/at91sam9261ek.h |5 +++--
include/configs/at91sam9263ek.h |5 +++--
include/configs/at91sam9rlek.h |5 +++--
6 files changed, 17 insertions(+), 11 deletions(-)
failed to apply
could you rebase it against u-boot-at91
Here it is.
Thanks,
Stelian.
-
From 5a769ae742ca62d451e412a77dbf31e691b755bf Mon Sep 17 00:00:00 2001
From: Stelian Pop [EMAIL PROTECTED]
Date: Thu, 6 Nov 2008 22:47:15 +0100
Subject: [PATCH] AT91: Use AT91_CPU_CLOCK in displays
Introduce AT91_CPU_CLOCK and use it for displaying the CPU
speed in the LCD driver.
Also make AT91_MAIN_CLOCK and AT91_MASTER_CLOCK reflect the
corresponding board clocks.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91cap9adk/at91cap9adk.c |2 +-
board/atmel/at91sam9261ek/at91sam9261ek.c |2 +-
board/atmel/at91sam9263ek/at91sam9263ek.c |2 +-
board/atmel/at91sam9rlek/at91sam9rlek.c |2 +-
include/configs/at91cap9adk.h |7 ---
include/configs/at91sam9260ek.h |8 +---
include/configs/at91sam9261ek.h |7 ---
include/configs/at91sam9263ek.h |7 ---
include/configs/at91sam9rlek.h|7 ---
9 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/board/atmel/at91cap9adk/at91cap9adk.c
b/board/atmel/at91cap9adk/at91cap9adk.c
index af145cc..f7d68b7 100644
--- a/board/atmel/at91cap9adk/at91cap9adk.c
+++ b/board/atmel/at91cap9adk/at91cap9adk.c
@@ -342,7 +342,7 @@ void lcd_show_board_info(void)
lcd_printf ([EMAIL PROTECTED]);
lcd_printf (%s CPU at %s MHz\n,
AT91_CPU_NAME,
- strmhz(temp, AT91_MAIN_CLOCK));
+ strmhz(temp, AT91_CPU_CLOCK));
dram_size = 0;
for (i = 0; i CONFIG_NR_DRAM_BANKS; i++)
diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c
b/board/atmel/at91sam9261ek/at91sam9261ek.c
index 185d6e1..14f236d 100644
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -225,7 +225,7 @@ void lcd_show_board_info(void)
lcd_printf ([EMAIL PROTECTED]);
lcd_printf (%s CPU at %s MHz\n,
AT91_CPU_NAME,
- strmhz(temp, AT91_MAIN_CLOCK));
+ strmhz(temp, AT91_CPU_CLOCK));
dram_size = 0;
for (i = 0; i CONFIG_NR_DRAM_BANKS; i++)
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c
b/board/atmel/at91sam9263ek/at91sam9263ek.c
index 4feed9a..ebd4649 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -276,7 +276,7 @@ void lcd_show_board_info(void)
lcd_printf ([EMAIL PROTECTED]);
lcd_printf (%s CPU at %s MHz\n,
AT91_CPU_NAME,
- strmhz(temp, AT91_MAIN_CLOCK));
+ strmhz(temp, AT91_CPU_CLOCK));
dram_size = 0;
for (i = 0; i CONFIG_NR_DRAM_BANKS; i++)
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c
b/board/atmel/at91sam9rlek/at91sam9rlek.c
index 992dd4c..b6fef9d 100644
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -197,7 +197,7 @@ void lcd_show_board_info(void)
lcd_printf ([EMAIL PROTECTED]);
lcd_printf (%s CPU at %s MHz\n,
AT91_CPU_NAME,
- strmhz(temp, AT91_MAIN_CLOCK));
+ strmhz(temp, AT91_CPU_CLOCK));
dram_size = 0;
for (i = 0; i CONFIG_NR_DRAM_BANKS; i++)
diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index 30a7cb4..667e049 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -29,9 +29,10 @@
/* ARM asynchronous clock */
#define AT91_CPU_NAME AT91CAP9
-#define AT91_MAIN_CLOCK2 /* from 12 MHz crystal
*/
-#define AT91_MASTER_CLOCK 1 /* peripheral = main / 2 */
-#define CONFIG_SYS_HZ 100 /* 1us resolution */
+#define AT91_MAIN_CLOCK1200/* 12 MHz crystal */
+#define AT91_MASTER_CLOCK 1 /* peripheral */
+#define AT91_CPU_CLOCK 2 /* cpu */
+#define CONFIG_SYS_HZ 100 /* 1us resolution */
#define AT91_SLOW_CLOCK32768 /* slow clock */
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index be9a8eb..81c8d39 100644
---
