[U-Boot] [PATCH] AT91RM9200: fix AT91_PMC_MCKR_MDIV_* defines for this CPU
The AT91RM9200 has a different bit assignment in PMC MCKR register than it's successors (verified by Atmel's manuals on AT91RM9200 and AT91SAM926). AT91RM9200 supports the additional divider of 3.
Signed-off-by: Guido Classen clagix@gmail.com
--- u-boot-git/arch/arm/include/asm/arch-at91/at91_pmc.h 2010-11-12 18:30:31.000000000 +0100 +++ u-boot-ccm2200/arch/arm/include/asm/arch-at91/at91_pmc.h 2010-11-16 22:00:56.000000000 +0100 @@ -91,10 +91,19 @@ #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
Dear clagix@gmail.com,
The AT91RM9200 has a different bit assignment in PMC MCKR register than it's successors (verified by Atmel's manuals on AT91RM9200 and AT91SAM926). AT91RM9200 supports the additional divider of 3.
Signed-off-by: Guido Classen clagix@gmail.com
--- u-boot-git/arch/arm/include/asm/arch-at91/at91_pmc.h 2010-11-12 18:30:31.000000000 +0100 +++ u-boot-ccm2200/arch/arm/include/asm/arch-at91/at91_pmc.h 2010-11-16 22:00:56.000000000 +0100 @@ -91,10 +91,19 @@ #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
This patch is not in git-format-patch format. You hijacked another thread to post this message.
Please resubmit!
Best Regards, Reinhard
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(-)
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
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
participants (3)
-
clagix＠gmail.com -
Guido Classen
-
Reinhard Meyer