Patchwork [U-Boot] AT91RM9200: fix AT91_PMC_MCKR_MDIV_* defines for this CPU

login
register
mail settings
Submitter clagix@gmail.com
Date Dec. 6, 2010, 6:03 p.m.
Message ID <87wrnmhj7q.fsf@tux-mobil.weiss-electronic.de>
Download mbox | patch
Permalink /patch/74420/
State Accepted
Commit a138d96aa88b6487c1409dd47a4ece9c3e1c3115
Delegated to: Reinhard Meyer
Headers show

Comments

clagix@gmail.com - Dec. 6, 2010, 6:03 p.m.
Dear Reinhard Meyer,

please find below the git-format-patch generated patch.
Sorry, I can not see whose thread I hijacked. May you please explain?

Best Regards
  Guido

Signed-off-by: Guido Classen <clagix@gmail.com>

---
 arch/arm/include/asm/arch-at91/at91_pmc.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
Reinhard Meyer - Dec. 17, 2010, 8:05 a.m.
Dear Guido Classen,
> Dear Reinhard Meyer,
> 
> please find below the git-format-patch generated patch.
> Sorry, I can not see whose thread I hijacked. May you please explain?
> 
> Best Regards
>   Guido

Please no patch irrelevant text before the "---" line below!
<manually fixed>

> 
> Signed-off-by: Guido Classen <clagix@gmail.com>
> 
> ---
>  arch/arm/include/asm/arch-at91/at91_pmc.h |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
Applied to u-boot-atmel/for-upstream.
Thanks,
Reinhard

Patch

diff --git a/arch/arm/include/asm/arch-at91/at91_pmc.h b/arch/arm/include/asm/arch-at91/at91_pmc.h
index 2f9ad96..fb8bb17 100644
--- a/arch/arm/include/asm/arch-at91/at91_pmc.h
+++ b/arch/arm/include/asm/arch-at91/at91_pmc.h
@@ -91,10 +91,18 @@  typedef struct at91_pmc {
 #define AT91_PMC_MCKR_PRES_64		0x00000018
 #define AT91_PMC_MCKR_PRES_MASK		0x0000001C
 
+#ifdef CONFIG_AT91RM9200
+#define AT91_PMC_MCKR_MDIV_1		0x00000000
+#define AT91_PMC_MCKR_MDIV_2		0x00000100
+#define AT91_PMC_MCKR_MDIV_3		0x00000200
+#define AT91_PMC_MCKR_MDIV_4		0x00000300
+#define AT91_PMC_MCKR_MDIV_MASK		0x00000300
+#else
 #define AT91_PMC_MCKR_MDIV_1		0x00000000
 #define AT91_PMC_MCKR_MDIV_2		0x00000100
 #define AT91_PMC_MCKR_MDIV_4		0x00000200
 #define AT91_PMC_MCKR_MDIV_MASK		0x00000300
+#endif
 
 #define AT91_PMC_MCKR_PLLADIV_1		0x00001000
 #define AT91_PMC_MCKR_PLLADIV_2		0x00002000