modify HT 1.6G PLL configure parameter for better stability and move some macros from start.S to ls7a_config.h.

Change-Id: Ia1808a150e3bcac7ad99c6e082ce4775d5a9c1da

Targets/Bonito3a3000_7a/Bonito/ls7a_config.h

@@ -42,3 +42,19 @@
 //#define USE_PCIE_PAD_REFCLK
 //#define USE_SATA_PAD_REFCLK
 #define USE_USB_SYS_REFCLK
+
+#define LS7A_GMEM_CFG
+#ifdef  LS7A_GMEM_CFG
+//#define DEBUG_GMEM_PARAM
+//#define DEBUG_GMEM
+#endif
+//#define DEBUG_HT1
+#ifdef  DEBUG_HT1
+//#define PRINT_HT1_REG
+#endif
+#define CHECK_HT_PLL_MODE
+
+#ifdef  MULTI_CHIP
+#define LS7A_2WAY_CONNECT
+#endif
+

Targets/Bonito3a3000_7a/Bonito/start.S

@@ -46,24 +46,9 @@
 #include "loongson3_def.h"
 #include "ls7a_config.h"
 
-#define LS7A_GMEM_CFG
-#ifdef  LS7A_GMEM_CFG
-//#define DEBUG_GMEM_PARAM
-//#define DEBUG_GMEM
-#endif
-//#define DEBUG_HT1
-#ifdef  DEBUG_HT1
-//#define PRINT_HT1_REG
-#endif
-#define CHECK_HT_PLL_MODE
-
 #include "../../../pmon/arch/mips/ls7a/ls7a_define.h"
 #include "../../../pmon/arch/mips/ls7a/ht.h"
 
-#ifdef  MULTI_CHIP
-#define LS7A_2WAY_CONNECT
-#endif
-
 /*
  *   Register usage:
  *

pmon/arch/mips/ls7a/ht.h

@@ -33,7 +33,7 @@
 #define LS3A_HT_PLL_2400M  ((1 << LS7A_HT_PLL_DIV_LO) | (1 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (24*3 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))
 #define LS3A_HT_PLL_2200M  ((1 << LS7A_HT_PLL_DIV_LO) | (1 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (22*3 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))
 #define LS3A_HT_PLL_2000M  ((1 << LS7A_HT_PLL_DIV_LO) | (1 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (20*3 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))
-#define LS3A_HT_PLL_1600M  ((1 << LS7A_HT_PLL_DIV_LO) | (1 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (16*3 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))
+#define LS3A_HT_PLL_1600M  ((2 << LS7A_HT_PLL_DIV_LO) | (2 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (32*3 << LS7A_HT_PLL_LOOPC) | (8 << LS7A_HT_PLL_DIV_CTRL))
 #define LS3A_HT_PLL_1200M  ((2 << LS7A_HT_PLL_DIV_LO) | (2 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (24*3 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))
 #define LS3A_HT_PLL_1000M  ((2 << LS7A_HT_PLL_DIV_LO) | (2 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (20*3 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))
 #define LS3A_HT_PLL_800M   ((2 << LS7A_HT_PLL_DIV_LO) | (2 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (16*3 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))
@@ -46,7 +46,7 @@
 #define LS7A_HT_PLL_2400M  ((1 << LS7A_HT_PLL_DIV_LO) | (1 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (24*4 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))
 #define LS7A_HT_PLL_2200M  ((1 << LS7A_HT_PLL_DIV_LO) | (1 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (22*4 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))
 #define LS7A_HT_PLL_2000M  ((1 << LS7A_HT_PLL_DIV_LO) | (1 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (20*4 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))
-#define LS7A_HT_PLL_1600M  ((1 << LS7A_HT_PLL_DIV_LO) | (1 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (16*4 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))
+#define LS7A_HT_PLL_1600M  ((2 << LS7A_HT_PLL_DIV_LO) | (2 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (32*4 << LS7A_HT_PLL_LOOPC) | (8 << LS7A_HT_PLL_DIV_CTRL))
 #define LS7A_HT_PLL_1200M  ((2 << LS7A_HT_PLL_DIV_LO) | (2 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (24*4 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))
 #define LS7A_HT_PLL_1000M  ((2 << LS7A_HT_PLL_DIV_LO) | (2 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (20*4 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))
 #define LS7A_HT_PLL_800M   ((2 << LS7A_HT_PLL_DIV_LO) | (2 << LS7A_HT_PLL_DIV_HI) | (3 << LS7A_HT_PLL_DIV_REFC) | (16*4 << LS7A_HT_PLL_LOOPC) | (4 << LS7A_HT_PLL_DIV_CTRL))