add rk3188 avs print support
authorchenxing <chenxing@rock-chips.com>
Sat, 27 Apr 2013 09:18:27 +0000 (17:18 +0800)
committerchenxing <chenxing@rock-chips.com>
Sat, 27 Apr 2013 09:29:22 +0000 (17:29 +0800)
You need to add operation in your vdd_core init as follows:
// set vdd_log = 1.1V;
avs_init_val_get(1, 1100000, "PMIC init");

arch/arm/mach-rk30/board-rk3168-tb.c
arch/arm/mach-rk3188/clock_data.c
arch/arm/mach-rk3188/dvfs.c
arch/arm/plat-rk/dvfs.c

index ede01b60625b3a6558dfbc258f85313ea3863845..dac7fbd3ca9b6483c63628c3d3bab70f861118ba 100644 (file)
@@ -2395,7 +2395,7 @@ static void rk30_pm_power_off(void)
 
 static void __init machine_rk30_board_init(void)
 {
-       //avs_init();
+       avs_init();
        gpio_request(POWER_ON_PIN, "poweronpin");
        gpio_direction_output(POWER_ON_PIN, GPIO_HIGH);
        
index 78e75a0b33b2177035d033522cb490760db35797..7e3ef5ed95504b330db5d6ebd3e0a364050c7cd1 100755 (executable)
@@ -2992,7 +2992,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);
index a228645cf56d3f8a06c10dbdb5b08b531511f190..d88b47a684109ba486a07267e231da39caa317b6 100755 (executable)
@@ -701,7 +701,7 @@ static struct depend_lookup rk30_depends[] = {
        //RK_DEPPENDS("gpu", &vd_cpu, NULL),\r
 };\r
 #endif\r
-//static struct avs_ctr_st rk30_avs_ctr;\r
+static struct avs_ctr_st rk30_avs_ctr;\r
 \r
 int rk3188_dvfs_init(void)\r
 {\r
@@ -723,16 +723,13 @@ int rk3188_dvfs_init(void)
 #ifndef NO_VOLT_DIFF\r
        dvfs_clk_cpu = dvfs_get_dvfs_clk_byname("cpu");\r
 #endif\r
-       //avs_board_init(&rk30_avs_ctr);\r
+       avs_board_init(&rk30_avs_ctr);\r
        return 0;\r
 }\r
 \r
 \r
 \r
 /******************************rk30 avs**************************************************/\r
-\r
-#if 0\r
-\r
 static void __iomem *rk30_nandc_base=NULL;\r
 \r
 #define nandc_readl(offset)    readl_relaxed(rk30_nandc_base + offset)\r
@@ -757,8 +754,8 @@ static u8 rk30_get_avs_val(void)
        nandc_writel(nanc_save_reg[0] | 0x1 << 14, 0);\r
        nandc_writel(0x5, 0x130);\r
 \r
-       nandc_writel(3, 0x158);\r
-       nandc_writel(1, 0x134);\r
+       nandc_writel(0x3, 0x158);\r
+       nandc_writel(0x21, 0x134);\r
 \r
        while(count--) {\r
                paramet = nandc_readl(0x138);\r
@@ -786,6 +783,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
index 3551288cf9c81967251b3a1f19e67cb7131b4f43..ab554b3b0c2cb6c386a4675e77f9632cd1bff822 100644 (file)
@@ -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,1150000,"board_init");\r
 }\r
 static u8 rk_get_avs_val(void)\r
 {\r
@@ -1258,10 +1258,13 @@ void avs_init_val_get(int index, int vol, char *s)
        init_avs_paramet[index].vol = vol;\r
        init_avs_paramet[index].s = s;\r
        init_avs_paramet[index].is_set++;\r
+       printk("DVFS MSG:\tAVS Value(index=%d): ", index);\r
        for(i = 0; i < init_avs_times; i++) {\r
                init_avs_paramet[index].paramet[i] = rk_get_avs_val();\r
                mdelay(1);\r
+               printk("%d ", init_avs_paramet[index].paramet[i]);\r
        }\r
+       printk("\n");\r
 }\r
 int avs_set_scal_val(u8 avs_base)\r
 {\r