From 09b50e7ad377fdfa66e16e9dd630996cbd433f87 Mon Sep 17 00:00:00 2001 From: chenxing Date: Mon, 12 Nov 2012 14:45:50 +0800 Subject: [PATCH] Revert "rk30/rk2928: disable dvfs tree debug and avs debug" This reverts commit d3c5f9f2f4ac1bcbbf5e51a83648f458fb327691. --- arch/arm/mach-rk2928/dvfs.c | 6 +----- arch/arm/mach-rk30/dvfs.c | 8 ++------ arch/arm/plat-rk/Kconfig | 8 -------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/arch/arm/mach-rk2928/dvfs.c b/arch/arm/mach-rk2928/dvfs.c index d3ff6cf6eeb2..acdf8502420e 100644 --- a/arch/arm/mach-rk2928/dvfs.c +++ b/arch/arm/mach-rk2928/dvfs.c @@ -1869,14 +1869,10 @@ struct dvfs_attribute { static struct dvfs_attribute dvfs_attrs[] = { /* node_name permision show_func store_func */ -#ifdef CONFIG_RK_DVFS_TREE_DBG __ATTR(dvfs_tree, S_IRUGO | S_IWUSR, dvfs_tree_show, dvfs_tree_store), -#endif -#ifdef CONFIG_RK_AVS_DBG __ATTR(avs_init, S_IRUGO | S_IWUSR, avs_init_show, avs_init_store), - __ATTR(avs_dyn, S_IRUGO | S_IWUSR, avs_dyn_show, avs_dyn_store), + //__ATTR(avs_dyn, S_IRUGO | S_IWUSR, avs_dyn_show, avs_dyn_store), __ATTR(avs_now, S_IRUGO | S_IWUSR, avs_now_show, avs_now_store), -#endif }; static int __init dvfs_init(void) diff --git a/arch/arm/mach-rk30/dvfs.c b/arch/arm/mach-rk30/dvfs.c index 3753dfdd8d22..b47ca9df06d3 100755 --- 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); if (IS_ERR_OR_NULL(dvfs_clk)){ DVFS_ERR("%s %s get dvfs_clk err\n", __func__, clk->name); - return ; + return -1; } dvfs_clk->clk_dvfs_target = clk_dvfs_target; } @@ -1865,14 +1865,10 @@ struct dvfs_attribute { static struct dvfs_attribute dvfs_attrs[] = { /* node_name permision show_func store_func */ -#ifdef CONFIG_RK_DVFS_TREE_DBG __ATTR(dvfs_tree, S_IRUGO | S_IWUSR, dvfs_tree_show, dvfs_tree_store), -#endif -#ifdef CONFIG_RK_AVS_DBG __ATTR(avs_init, S_IRUGO | S_IWUSR, avs_init_show, avs_init_store), - __ATTR(avs_dyn, S_IRUGO | S_IWUSR, avs_dyn_show, avs_dyn_store), + //__ATTR(avs_dyn, S_IRUGO | S_IWUSR, avs_dyn_show, avs_dyn_store), __ATTR(avs_now, S_IRUGO | S_IWUSR, avs_now_show, avs_now_store), -#endif }; static int __init dvfs_init(void) diff --git a/arch/arm/plat-rk/Kconfig b/arch/arm/plat-rk/Kconfig index 5dd3f06be381..68960de88248 100755 --- 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 -- 2.34.1