diff options
| author | Asen Dimov <dimov@ronetix.at> | 2010-03-18 13:46:45 +0200 |
|---|---|---|
| committer | trix <trix@windriver.com> | 2010-04-03 15:24:27 -0500 |
| commit | e99056e3877d1f04a36991aa48f1c690547f5ab9 (patch) | |
| tree | 4bb4402b4eb63fe6fdba61692f415c53a742e3a1 /cpu | |
| parent | 4b894a97d307c3207af40031d9e820e2960de57f (diff) | |
| download | blackbird-obmc-uboot-e99056e3877d1f04a36991aa48f1c690547f5ab9.tar.gz blackbird-obmc-uboot-e99056e3877d1f04a36991aa48f1c690547f5ab9.zip | |
using AT91_PMC_MCKR_MDIV_ instead of LEGACY one in at91/clock.c
Signed-off-by: Asen Dimov <dimov@ronetix.at>
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/arm926ejs/at91/clock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpu/arm926ejs/at91/clock.c b/cpu/arm926ejs/at91/clock.c index b06d7601b9..ecf91f5187 100644 --- a/cpu/arm926ejs/at91/clock.c +++ b/cpu/arm926ejs/at91/clock.c @@ -203,7 +203,8 @@ int at91_clock_init(unsigned long main_clock) if (mckr & AT91_PMC_MCKR_MDIV_MASK) freq /= 2; /* processor clock division */ #elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) - mck_rate_hz = (mckr & AT91_PMC_MCKR_MDIV_MASK) == AT91SAM9_PMC_MDIV_3 + mck_rate_hz = (mckr & AT91_PMC_MCKR_MDIV_MASK) == + (AT91_PMC_MCKR_MDIV_2 | AT91_PMC_MCKR_MDIV_4) ? freq / 3 : freq / (1 << ((mckr & AT91_PMC_MCKR_MDIV_MASK) >> 8)); #else |
