From: chenxing <chenxing@rock-chips.com>
Date: Sat, 27 Apr 2013 10:07:01 +0000 (+0800)
Subject: rk3168: add avs print support
X-Git-Tag: firefly_0821_release~7202
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=234094135270ee9ce2735eee46659222d2e1015b;p=firefly-linux-kernel-4.4.55.git

rk3168: add avs print support
---

diff --git a/arch/arm/mach-rk30/clock_data-rk3066b.c b/arch/arm/mach-rk30/clock_data-rk3066b.c
index 3c92e19df8ce..368e3de016a7 100755
--- a/arch/arm/mach-rk30/clock_data-rk3066b.c
+++ b/arch/arm/mach-rk30/clock_data-rk3066b.c
@@ -3080,7 +3080,7 @@ static void __init rk30_init_enable_clocks(void)
 	clk_enable_nolock(&clk_hclk_peri_ahb_arbi);
 	clk_enable_nolock(&clk_hclk_emem_peri);
 	//clk_enable_nolock(&clk_hclk_mac);
-	//clk_enable_nolock(&clk_nandc);
+	clk_enable_nolock(&clk_nandc);
 	clk_enable_nolock(&clk_hclk_usb_peri);
 	#if 0
 	clk_enable_nolock(&clk_hclk_otg0);
diff --git a/arch/arm/mach-rk30/dvfs.c b/arch/arm/mach-rk30/dvfs.c
index 06f7c6d28b3c..e524ac3e2f07 100755
--- a/arch/arm/mach-rk30/dvfs.c
+++ b/arch/arm/mach-rk30/dvfs.c
@@ -612,7 +612,6 @@ int rk_dvfs_init(void)
 
 /******************************rk30 avs**************************************************/
 
-#ifdef CONFIG_ARCH_RK3066B
 
 static void __iomem *rk30_nandc_base=NULL;
 
@@ -638,7 +637,11 @@ static u8 rk30_get_avs_val(void)
 	nandc_writel(nanc_save_reg[0] | 0x1 << 14, 0);
 	nandc_writel(0x5, 0x130);
 
+#ifdef CONFIG_ARCH_RK3066B
 	nandc_writel(3, 0x158);
+#else
+	nandc_writel(7, 0x158);
+#endif
 	nandc_writel(1, 0x134);
 
 	while(count--) {
@@ -667,6 +670,5 @@ static struct avs_ctr_st rk30_avs_ctr= {
 	.avs_init 		=rk30_avs_init,
 	.avs_get_val	= rk30_get_avs_val,
 };
-#endif
 
 
diff --git a/arch/arm/plat-rk/dvfs.c b/arch/arm/plat-rk/dvfs.c
index ab554b3b0c2c..e7c6d6953147 100644
--- a/arch/arm/plat-rk/dvfs.c
+++ b/arch/arm/plat-rk/dvfs.c
@@ -1237,7 +1237,7 @@ void avs_init(void)
 	memset(&init_avs_paramet[0].is_set, 0, sizeof(init_avs_paramet));
 	if(avs_ctr_data&&avs_ctr_data->avs_init)
 		avs_ctr_data->avs_init();
-	//avs_init_val_get(0,1150000,"board_init");
+	avs_init_val_get(0, 1200000,"board_init");
 }
 static u8 rk_get_avs_val(void)
 {