commit c0dd8db18ad39bdd4c1d2cb10351886c840627e0
author Bo Shen <voice.shen@atmel.com> Mon Dec 15 13:24:27 2014 +0800
committer Andreas Bießmann <andreas.devel@googlemail.com> Sat Feb 07 23:42:40 2015 +0100
tree 31fb1857a54b5a87dabce957225faa6545de94ff
parent 865dd4c99358b71f1408d4992fc08fc56a6cdc46

ARM: atmel: clock: make it possible to configure HMX32

Signed-off-by: Bo Shen <voice.shen@atmel.com>

arch/arm/cpu/armv7/at91/clock.c

diff --git a/arch/arm/cpu/armv7/at91/clock.c b/arch/arm/cpu/armv7/at91/clock.c
index 2cdddb2..0bf453e 100644
--- a/arch/arm/cpu/armv7/at91/clock.c
+++ b/arch/arm/cpu/armv7/at91/clock.c
@@ -130,10 +130,18 @@
 		 AT91_PMC_MCKR_PRES_MASK |
 		 AT91_PMC_MCKR_MDIV_MASK |
 		 AT91_PMC_MCKR_PLLADIV_2);
+#ifdef CPU_HAS_H32MXDIV
+	tmp &= ~AT91_PMC_MCKR_H32MXDIV;
+#endif
+
 	tmp |= mckr & (AT91_PMC_MCKR_CSS_MASK  |
 		       AT91_PMC_MCKR_PRES_MASK |
 		       AT91_PMC_MCKR_MDIV_MASK |
 		       AT91_PMC_MCKR_PLLADIV_2);
+#ifdef CPU_HAS_H32MXDIV
+	tmp |= mckr & AT91_PMC_MCKR_H32MXDIV;
+#endif
+
 	writel(tmp, &pmc->mckr);
 
 	while (!(readl(&pmc->sr) & AT91_PMC_MCKRDY))