Revert "rk30/rk2928: disable dvfs tree debug and avs debug"

This reverts commit d3c5f9f2f4ac1bcbbf5e51a83648f458fb327691.

diff --git a/arch/arm/mach-rk2928/dvfs.c b/arch/arm/mach-rk2928/dvfs.c
index d3ff6cf6eeb2ed6f24af7459cfcb2082ef189c80..acdf8502420e565ed088f2e04fdb46716e48df3d 100644 (file)
--- a/arch/arm/mach-rk2928/dvfs.c
+++ b/arch/arm/mach-rk2928/dvfs.c
@@ -1869,14 +1869,10 @@ struct dvfs_attribute {
 \r
 static struct dvfs_attribute dvfs_attrs[] = {\r
        /*     node_name        permision               show_func       store_func */\r
-#ifdef CONFIG_RK_DVFS_TREE_DBG\r
        __ATTR(dvfs_tree,       S_IRUGO | S_IWUSR,      dvfs_tree_show, dvfs_tree_store),\r
-#endif\r
-#ifdef CONFIG_RK_AVS_DBG\r
        __ATTR(avs_init,        S_IRUGO | S_IWUSR,      avs_init_show,  avs_init_store),\r
-       __ATTR(avs_dyn,         S_IRUGO | S_IWUSR,      avs_dyn_show,   avs_dyn_store),\r
+       //__ATTR(avs_dyn,               S_IRUGO | S_IWUSR,      avs_dyn_show,   avs_dyn_store),\r
        __ATTR(avs_now,         S_IRUGO | S_IWUSR,      avs_now_show,   avs_now_store),\r
-#endif\r
 };\r
 \r
 static int __init dvfs_init(void)\r

diff --git a/arch/arm/mach-rk30/dvfs.c b/arch/arm/mach-rk30/dvfs.c
index 3753dfdd8d22e5beec867160b185da68e989545b..b47ca9df06d3d43770c73114ed7c61213499146b 100755 (executable)
--- a/arch/arm/mach-rk30/dvfs.c
+++ b/arch/arm/mach-rk30/dvfs.c
@@ -267,7 +267,7 @@ void dvfs_clk_register_set_rate_callback(struct clk *clk, clk_dvfs_target_callba
        struct clk_node *dvfs_clk = clk_get_dvfs_info(clk);\r
        if (IS_ERR_OR_NULL(dvfs_clk)){\r
                DVFS_ERR("%s %s get dvfs_clk err\n", __func__, clk->name);\r
-               return ;\r
+               return -1;\r
        }\r
        dvfs_clk->clk_dvfs_target = clk_dvfs_target;\r
 }\r
@@ -1865,14 +1865,10 @@ struct dvfs_attribute {
 \r
 static struct dvfs_attribute dvfs_attrs[] = {\r
        /*     node_name        permision               show_func       store_func */\r
-#ifdef CONFIG_RK_DVFS_TREE_DBG\r
        __ATTR(dvfs_tree,       S_IRUGO | S_IWUSR,      dvfs_tree_show, dvfs_tree_store),\r
-#endif\r
-#ifdef CONFIG_RK_AVS_DBG\r
        __ATTR(avs_init,        S_IRUGO | S_IWUSR,      avs_init_show,  avs_init_store),\r
-       __ATTR(avs_dyn,         S_IRUGO | S_IWUSR,      avs_dyn_show,   avs_dyn_store),\r
+       //__ATTR(avs_dyn,               S_IRUGO | S_IWUSR,      avs_dyn_show,   avs_dyn_store),\r
        __ATTR(avs_now,         S_IRUGO | S_IWUSR,      avs_now_show,   avs_now_store),\r
-#endif\r
 };\r
 \r
 static int __init dvfs_init(void)\r

diff --git a/arch/arm/plat-rk/Kconfig b/arch/arm/plat-rk/Kconfig
index 5dd3f06be3810652613fd60c6a3d723ce51a6f9b..68960de8824850e34b3c42161b123de5a2665f4d 100755 (executable)
--- a/arch/arm/plat-rk/Kconfig
+++ b/arch/arm/plat-rk/Kconfig
@@ -101,14 +101,6 @@ config DVFS
        depends on REGULATOR&&CPU_FREQ
        default y
 
-config RK_DVFS_TREE_DBG
-       bool "Enable dvfs tree debug"
-       depends on DVFS
-
-config RK_AVS_DBG
-       bool "Enable avs(auto voltage scale) debug"
-       depends on DVFS
-
 config RK_CLOCK_PROC
        bool "/proc/clocks support"
        depends on PROC_FS