[U-Boot] [PATCH 5/9 V4] convert common files to new SoC access

Daniel Gorsulowski
2010-02-11T07:52:21Z

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