TX6 Release 2013-04-22

[karo-tx-uboot.git] / arch / arm / include / asm / arch-am33xx / clocks_am33xx.h

diff --git a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
index d748dd27873a0bac3e75c00c63f8471fcd2c2108..aae804f336d49d65b00e9a49cbb20b28d60aae21 100644 (file)
--- a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
+++ b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
@@ -21,14 +21,18 @@
 
 #define OSC    (V_OSCK/1000000)
 
+#ifndef CONFIG_SYS_MPU_CLK
 /* MAIN PLL Fdll = 550 MHZ, */
 #define MPUPLL_M       550
-#define MPUPLL_N       (OSC-1)
+#else
+#define MPUPLL_M       CONFIG_SYS_MPU_CLK
+#endif
+#define MPUPLL_N       (OSC - 1)
 #define MPUPLL_M2      1
 
 /* Core PLL Fdll = 1 GHZ, */
 #define COREPLL_M      1000
-#define COREPLL_N      (OSC-1)
+#define COREPLL_N      (OSC - 1)
 
 #define COREPLL_M4     10      /* CORE_CLKOUTM4 = 200 MHZ */
 #define COREPLL_M5     8       /* CORE_CLKOUTM5 = 250 MHZ */
@@ -40,15 +44,23 @@
  * For clkout = 192 MHZ, Fdll = 960 MHZ, divider values are given below
  */
 #define PERPLL_M       960
-#define PERPLL_N       (OSC-1)
+#define PERPLL_N       (OSC - 1)
 #define PERPLL_M2      5
 
 /* DDR Freq is 266 MHZ for now */
 /* Set Fdll = 400 MHZ , Fdll = M * 2 * CLKINP/ N + 1; clkout = Fdll /(2 * M2) */
+#ifndef CONFIG_SYS_DDR_CLK
 #define DDRPLL_M       266
-#define DDRPLL_N       (OSC-1)
+#else
+#define DDRPLL_M       CONFIG_SYS_DDR_CLK
+#endif
+#define DDRPLL_N       (OSC - 1)
 #define DDRPLL_M2      1
 
+#define DISPPLL_M      200
+#define DISPPLL_N      (OSC - 1)
+#define DISPPLL_M2     1
+
 extern void pll_init(void);
 extern void enable_emif_clocks(void);