Skip to contentSkip to conversation

using AT91_PMC_MCKR_MDIV_ instead of LEGACY one in at91/clock.c

PATCH New Asen Dimov 2 participants 2 messages Mar 18, 2010 – Mar 28, 2010 Arm/Microchip (AT91) SoC support

lore
Share & tools
lore

Asen Dimov

author
#0 lore raw

PATCH 1/1 using AT91_PMC_MCKR_MDIV_ instead of LEGACY one in at91/clock.c

---
 cpu/arm926ejs/at91/clock.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
cpu/arm926ejs/at91/clock.c +2 -1
index b06d760..ecf91f5 100644
@@ -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
Signature · 1 line
1.5.5.6
Applied
#1 lore raw

PATCH 1/1 using AT91_PMC_MCKR_MDIV_ instead of LEGACY one in at91/clock.c

Quoted 10 lines · Asen Dimov
---
 cpu/arm926ejs/at91/clock.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
cpu/arm926ejs/at91/clock.c +0 -0
index b06d760..ecf91f5 100644

cpu/arm926ejs/at91/clock.c int at91_clock_init(unsigned long main_clock) · line 210

Quoted 9 lines
cpu/arm926ejs/at91/clock.c +2 -1
@@ -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