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 3c92e19df8ced3604c02db5d41baef19db0f074e..368e3de016a73dc79740507e7319712fa9efcc4c 100755 (executable)
--- 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 06f7c6d28b3c354b22232b6bd3a6a441258a1327..e524ac3e2f072b6ae168a924120d3b6be7d477e9 100755 (executable)
--- a/arch/arm/mach-rk30/dvfs.c
+++ b/arch/arm/mach-rk30/dvfs.c
@@ -612,7 +612,6 @@ int rk_dvfs_init(void)
 \r
 /******************************rk30 avs**************************************************/\r
 \r
-#ifdef CONFIG_ARCH_RK3066B\r
 \r
 static void __iomem *rk30_nandc_base=NULL;\r
 \r
@@ -638,7 +637,11 @@ static u8 rk30_get_avs_val(void)
        nandc_writel(nanc_save_reg[0] | 0x1 << 14, 0);\r
        nandc_writel(0x5, 0x130);\r
 \r
+#ifdef CONFIG_ARCH_RK3066B\r
        nandc_writel(3, 0x158);\r
+#else\r
+       nandc_writel(7, 0x158);\r
+#endif\r
        nandc_writel(1, 0x134);\r
 \r
        while(count--) {\r
@@ -667,6 +670,5 @@ static struct avs_ctr_st rk30_avs_ctr= {
        .avs_init               =rk30_avs_init,\r
        .avs_get_val    = rk30_get_avs_val,\r
 };\r
-#endif\r
 \r
 \r

diff --git a/arch/arm/plat-rk/dvfs.c b/arch/arm/plat-rk/dvfs.c
index ab554b3b0c2cb6c386a4675e77f9632cd1bff822..e7c6d6953147f9ec30eb3f38687ed6c0d0035610 100644 (file)
--- 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));\r
        if(avs_ctr_data&&avs_ctr_data->avs_init)\r
                avs_ctr_data->avs_init();\r
-       //avs_init_val_get(0,1150000,"board_init");\r
+       avs_init_val_get(0, 1200000,"board_init");\r
 }\r
 static u8 rk_get_avs_val(void)\r
 {\r