Merge tag 'KARO-TX6-2015-03-24' into uboot-merge

[karo-tx-uboot.git] / arch / arm / include / asm / arch-mx6 / crm_regs.h

diff --git a/arch/arm/include/asm/arch-mx6/crm_regs.h b/arch/arm/include/asm/arch-mx6/crm_regs.h
index c5e1ac2160d1808ebfc7eeb58a064c4adea223fb..e090f4baabfcbd46cb0c043ee725cbba94595df4 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/crm_regs.h
+++ b/arch/arm/include/asm/arch-mx6/crm_regs.h
@@ -965,10 +965,15 @@ struct anatop_regs {
 #define BF_ANADIG_TEMPSENSE1_MEASURE_FREQ(v)                   \
        (((v) << BP_ANADIG_TEMPSENSE1_MEASURE_FREQ) & BM_ANADIG_TEMPSENSE1_MEASURE_FREQ)
 
+#ifdef CONFIG_MX6Q
 #define PLL2_PFD0_FREQ         352000000
 #define PLL2_PFD1_FREQ         594000000
-#define PLL2_PFD2_FREQ         400000000
-#define PLL2_PFD2_DIV_FREQ     200000000
+#else
+#define PLL2_PFD0_FREQ         306580000
+#define PLL2_PFD1_FREQ         528000000
+#endif
+#define PLL2_PFD2_FREQ         396000000
+#define PLL2_PFD2_DIV_FREQ     (PLL2_PFD2_FREQ / 2)
 #define PLL3_PFD0_FREQ         720000000
 #define PLL3_PFD1_FREQ         540000000
 #define PLL3_PFD2_FREQ         508200000