AT91RM9200: fix AT91_PMC_MCKR_MDIV_* defines for this CPU
Subsystems (2)
PATCH 1/1 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.
arch/arm/include/asm/arch-at91/at91_pmc.h +8 -0
@@ -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
PATCH 1/1 AT91RM9200: fix AT91_PMC_MCKR_MDIV_* defines for this CPU
Dear clagix at gmail.com,
Quoted 17 lines
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 <[email protected]>arch/arm/include/asm/arch-at91/at91_pmc.h +5
-0@@ -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
arch/arm/include/asm/arch-at91/at91_pmc.h line 108
Quoted 10 lines
arch/arm/include/asm/arch-at91/at91_pmc.h +3
-0+#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
PATCH 1/1 AT91RM9200: fix AT91_PMC_MCKR_MDIV_* defines for this CPU
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
--- arch/arm/include/asm/arch-at91/at91_pmc.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
arch/arm/include/asm/arch-at91/at91_pmc.h +8 -0
@@ -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
Signature · 1 line
1.7.0
PATCH 1/1 AT91RM9200: fix AT91_PMC_MCKR_MDIV_* defines for this CPU
Dear Guido Classen,
Quoted 7 lines
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>
Quoted 6 lines
Signed-off-by Guido Classen <[email protected]>--- 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