* [U-Boot] [PATCH] using AT91_PMC_MCKR_MDIV_ instead of LEGACY one in at91/clock.c
@ 2010-03-18 11:46 Asen Dimov
2010-03-28 12:19 ` Tom
0 siblings, 1 reply; 2+ messages in thread
From: Asen Dimov @ 2010-03-18 11:46 UTC (permalink / raw)
To: u-boot
Signed-off-by: Asen Dimov <dimov@ronetix.at>
---
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 b06d760..ecf91f5 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
--
1.5.5.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH] using AT91_PMC_MCKR_MDIV_ instead of LEGACY one in at91/clock.c
2010-03-18 11:46 [U-Boot] [PATCH] using AT91_PMC_MCKR_MDIV_ instead of LEGACY one in at91/clock.c Asen Dimov
@ 2010-03-28 12:19 ` Tom
0 siblings, 0 replies; 2+ messages in thread
From: Tom @ 2010-03-28 12:19 UTC (permalink / raw)
To: u-boot
Asen Dimov wrote:
> Signed-off-by: Asen Dimov <dimov@ronetix.at>
> ---
> 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 b06d760..ecf91f5 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
Applied to arm/next
Thanks
Tom
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-28 12:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-18 11:46 [U-Boot] [PATCH] using AT91_PMC_MCKR_MDIV_ instead of LEGACY one in at91/clock.c Asen Dimov
2010-03-28 12:19 ` Tom
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox