From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
Date: Thu, 11 Feb 2010 08:52:21 +0100
Subject: [U-Boot] [PATCH 5/9 V4] convert common files to new SoC access
In-Reply-To: <4B69EED2.8040604@scharsoft.de>
References: <4B5AD783.7080904@scharsoft.de> <4B69EED2.8040604@scharsoft.de>
Message-ID: <4B73B735.4070909@esd.eu>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hello Jens,

Jens Scharsig wrote:
>  * add's a warning to all files, which need update to new SoC access
>  * convert common files in cpu/../at91 and a lot of drivers to use
>    c stucture SoC access

<snip>

> diff --git a/cpu/arm926ejs/at91/clock.c b/cpu/arm926ejs/at91/clock.c
> index 574f488..7e03907 100644
> --- a/cpu/arm926ejs/at91/clock.c
> +++ b/cpu/arm926ejs/at91/clock.c

<snip>

IMHO you slipped the following:

diff --git a/cpu/arm926ejs/at91/clock.c b/cpu/arm926ejs/at91/clock.c
index 7e03907..b6f434a 100644
--- a/cpu/arm926ejs/at91/clock.c
+++ b/cpu/arm926ejs/at91/clock.c
@@ -157,9 +157,9 @@ int at91_clock_init(unsigned long main_clock)
 	 */
 	if (!main_clock) {
 		do {
-			tmp = at91_sys_read(AT91_CKGR_MCFR);
-		} while (!(tmp & AT91_PMC_MAINRDY));
-		main_clock = (tmp & AT91_PMC_MAINF) * (AT91_SLOW_CLOCK / 16);
+			tmp = readl(&pmc->mcfr);
+		} while (!(tmp & AT91_PMC_IXR_MCKRDY));
+		main_clock = (tmp & (0xffff <<  0)) * (AT91_SLOW_CLOCK / 16);
 	}
 #endif
 	main_clk_rate_hz = main_clock;
--

I replaced AT91_PMC_MAINF with (0xffff <<  0), because AT91_PMC_MAINF in not
available anymore. Maybe you find a better solution...

Best regards,
Daniel Gorsulowski