summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-12-17 19:55:55 +0100
committerWolfgang Denk <wd@denx.de>2010-12-17 19:55:55 +0100
commit85579906cb241ab0f544a2d5ba6d9e33714ec897 (patch)
tree85646b2816f849b9482be4061fccee5718997960 /arch
parent8a16f9c6747447aecda6619568d6747f0adf6561 (diff)
parenta138d96aa88b6487c1409dd47a4ece9c3e1c3115 (diff)
downloadu-boot-imx-85579906cb241ab0f544a2d5ba6d9e33714ec897.zip
u-boot-imx-85579906cb241ab0f544a2d5ba6d9e33714ec897.tar.gz
u-boot-imx-85579906cb241ab0f544a2d5ba6d9e33714ec897.tar.bz2
Merge branch 'for-upstream' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/arch-at91/at91_pmc.h8
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