From: chenxing <chenxing@rock-chips.com>
Date: Wed, 25 Sep 2013 06:45:37 +0000 (+0800)
Subject: rk: pm_test: fix test string err, update test frequencies, set END23
X-Git-Tag: firefly_0821_release~6607
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bb7a53339250db99ce9a2af0832615414738b920;p=firefly-linux-kernel-4.4.55.git

rk: pm_test: fix test string err, update test frequencies, set END23
---

diff --git a/arch/arm/plat-rk/rk_pm_tests/ft/ft_test.c b/arch/arm/plat-rk/rk_pm_tests/ft/ft_test.c
index 487135f11318..19cd62bf48c2 100755
--- a/arch/arm/plat-rk/rk_pm_tests/ft/ft_test.c
+++ b/arch/arm/plat-rk/rk_pm_tests/ft/ft_test.c
@@ -54,7 +54,7 @@ REVISION 0.01
 #include <linux/gpio.h>
 
 
-
+#if 0
 #define ft_printk(fmt, arg...) \
 	printk(KERN_EMERG fmt, ##arg)
  //KERN_DEBUG
@@ -64,12 +64,21 @@ REVISION 0.01
  //KERN_WARNING
 #define ft_printk_info(fmt, arg...) \
 	printk(KERN_EMERG fmt, ##arg)
+#else
+
+#define ft_printk(fmt, arg...) \
+	printk(KERN_EMERG fmt, ##arg)
+ //KERN_DEBUG
+#define ft_printk_dbg(fmt, arg...) {while(0);}
 
+ //KERN_WARNING
+#define ft_printk_info(fmt, arg...) {while(0);}
+#endif
 
 
 #define MHZ (1000*1000)
 #define TST_SETUPS (4)
-#define FT_END_CNT (0x21)
+#define FT_END_CNT (0x23)
 
 #define ENABLE_FT_TEST_GPIO   // for ft seting 1.6G volt
 
@@ -87,7 +96,7 @@ static int setups_flag[TST_SETUPS]={0,0,0,0};
 
 #if defined(CONFIG_ARCH_RK3188)
 
-#if 1  // Á½µµ²âÊÔ
+#if 0  // Á½µµ²âÊÔ
 const static unsigned long arm_setups_rate[TST_SETUPS]={816*MHZ,1608*MHZ*1,0,0};
 const static unsigned long l1_tst_cnt[TST_SETUPS]={5*10*1,5*10*1,5*10*21,5*10*1};
 const static unsigned long l2_cpy_cnt[TST_SETUPS]={5*1+2,5*2+4,5*2+4,5*2+4};
@@ -95,8 +104,8 @@ const static unsigned long l2_cpy_cnt[TST_SETUPS]={5*1+2,5*2+4,5*2+4,5*2+4};
 #else
 
 //const static unsigned long arm_setups_rate[TST_SETUPS]={312*MHZ,1656*MHZ*1,1608*MHZ*1,312*MHZ*1};
-
-const static unsigned long arm_setups_rate[TST_SETUPS]={816*MHZ,1608*MHZ*1,816*MHZ*1,1608*MHZ*1};
+const static unsigned long arm_setups_rate[TST_SETUPS]={816*MHZ,1656*MHZ*1,1608*MHZ*1,312*MHZ*1};
+//const static unsigned long arm_setups_rate[TST_SETUPS]={816*MHZ,1608*MHZ*1,816*MHZ*1,1608*MHZ*1};
 const static unsigned long l1_tst_cnt[TST_SETUPS]={5*10*2,5*10*2,5*10*2,5*10*2};
 const static unsigned long l2_cpy_cnt[TST_SETUPS]={5*1+2,5*2+4,5*2+4,5*2+4};
 
@@ -107,7 +116,8 @@ const static unsigned long l2_cpy_cnt[TST_SETUPS]={5*1+2,5*2+4,5*2+4,5*2+4};
 
 #elif defined(CONFIG_SOC_RK3168)
 
-const static unsigned long arm_setups_rate[4]={552*MHZ,1608*MHZ*1,0,0};
+const static unsigned long arm_setups_rate[4] = {552 * MHZ, 1200 * MHZ, 1608 * MHZ, 0};
+//const static unsigned long arm_setups_rate[4]={552*MHZ,0,0,0};
 
 const static unsigned long l1_tst_cnt[TST_SETUPS]={5*10,5*10,0,0};
 const static unsigned long l2_cpy_cnt[TST_SETUPS]={5*3,5*4,0,0};
@@ -719,7 +729,7 @@ static int rk_ft_tests_over(void)
 {
 	int ret = 0;
 
-	ft_cpu_test_type0_check(0,"KERENL");
+	ft_cpu_test_type0_check(0,"KERNEL");
 	
 	ft_cpu_test_type1_check(1,"HSPEED");