From c75f38636cda9e0bb813929cd71c5c63bd87c4fb Mon Sep 17 00:00:00 2001 From: chenxing <chenxing@rock-chips.com> Date: Mon, 12 Nov 2012 15:04:47 +0800 Subject: [PATCH] rk2928/rk30xx: disable dvfs tree debug and avs debug, same Macro as /proc/clocks --- arch/arm/mach-rk2928/dvfs.c | 6 ++++-- arch/arm/mach-rk30/dvfs.c | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-rk2928/dvfs.c b/arch/arm/mach-rk2928/dvfs.c index acdf8502420e..d9c27df6421c 100644 --- a/arch/arm/mach-rk2928/dvfs.c +++ b/arch/arm/mach-rk2928/dvfs.c @@ -1869,10 +1869,12 @@ struct dvfs_attribute { static struct dvfs_attribute dvfs_attrs[] = { /* node_name permision show_func store_func */ +#ifdef CONFIG_RK_CLOCK_PROC __ATTR(dvfs_tree, S_IRUGO | S_IWUSR, dvfs_tree_show, dvfs_tree_store), - __ATTR(avs_init, S_IRUGO | S_IWUSR, avs_init_show, avs_init_store), + //__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_now, S_IRUGO | S_IWUSR, avs_now_show, avs_now_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 b47ca9df06d3..4cacf70b8095 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 -1; + return ; } dvfs_clk->clk_dvfs_target = clk_dvfs_target; } @@ -1865,10 +1865,12 @@ struct dvfs_attribute { static struct dvfs_attribute dvfs_attrs[] = { /* node_name permision show_func store_func */ +#ifdef CONFIG_RK_CLOCK_PROC __ATTR(dvfs_tree, S_IRUGO | S_IWUSR, dvfs_tree_show, dvfs_tree_store), - __ATTR(avs_init, S_IRUGO | S_IWUSR, avs_init_show, avs_init_store), + //__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_now, S_IRUGO | S_IWUSR, avs_now_show, avs_now_store), + //__ATTR(avs_now, S_IRUGO | S_IWUSR, avs_now_show, avs_now_store), +#endif }; static int __init dvfs_init(void) -- 2.34.1