rk30xx: fix compiled error when disable dvfs

diff --git a/arch/arm/mach-rk30/clock_data-rk3066b.c b/arch/arm/mach-rk30/clock_data-rk3066b.c
index 3d6e1b7f374d694c4e823e3c7254ab233c5bc731..8920de191af45ff95dd83d2aad14a2a7a8fa2ab3 100644 (file)
--- a/arch/arm/mach-rk30/clock_data-rk3066b.c
+++ b/arch/arm/mach-rk30/clock_data-rk3066b.c
@@ -3268,11 +3268,10 @@ void __init _rk30_clock_data_init(unsigned long gpll, unsigned long cpll, int fl
 
 }
 
-int rk30_dvfs_init(void);
 void __init rk30_clock_data_init(unsigned long gpll, unsigned long cpll, u32 flags)
 {
        _rk30_clock_data_init(gpll, cpll, flags);
-       rk30_dvfs_init();
+       rk_dvfs_init();
 }
 
 /*

diff --git a/arch/arm/mach-rk30/clock_data.c b/arch/arm/mach-rk30/clock_data.c
index 76432c8d1ac598bd6afb08e303d44f4f93a0cdad..69fcb5eea65cc7b39dae5e1c32acf294415e0cb8 100644 (file)
--- a/arch/arm/mach-rk30/clock_data.c
+++ b/arch/arm/mach-rk30/clock_data.c
@@ -3422,12 +3422,12 @@ void __init _rk30_clock_data_init(unsigned long gpll,unsigned long cpll,int flag
        //cru_writel(0x07000000,CRU_MISC_CON);
        
 }
-int rk30_dvfs_init(void);
+int rk_dvfs_init(void);
 
 void __init rk30_clock_data_init(unsigned long gpll,unsigned long cpll,u32 flags)
 {
        _rk30_clock_data_init(gpll,cpll,flags);
-       rk30_dvfs_init();
+       rk_dvfs_init();
 }
 
 /*

diff --git a/arch/arm/mach-rk30/dvfs.c b/arch/arm/mach-rk30/dvfs.c
index 01e56220b73002a213da12d96fa086f81007a136..caa54218c385364c80b5b93dd8877678c19d87cf 100755 (executable)
--- a/arch/arm/mach-rk30/dvfs.c
+++ b/arch/arm/mach-rk30/dvfs.c
@@ -577,7 +577,7 @@ static struct depend_lookup rk30_depends[] = {
 };\r
 static struct avs_ctr_st rk30_avs_ctr;\r
 \r
-int rk30_dvfs_init(void)\r
+int rk_dvfs_init(void)\r
 {\r
        int i = 0;\r
        for (i = 0; i < ARRAY_SIZE(rk30_vds); i++) {\r

diff --git a/arch/arm/mach-rk30/include/mach/dvfs.h b/arch/arm/mach-rk30/include/mach/dvfs.h
index 0e88605f06c4b3ae393c5b88a97ee53da8abcb32..cd9f96bbb613e3a44d090f59f26b0a75bf40b7fe 100644 (file)
--- a/arch/arm/mach-rk30/include/mach/dvfs.h
+++ b/arch/arm/mach-rk30/include/mach/dvfs.h
@@ -1 +1,13 @@
+#ifndef RK_MACH_DVFS_H
+#define RK_MACH_DVFS_H
+
 #include <plat/dvfs.h>
+
+#ifdef CONFIG_DVFS
+int rk_dvfs_init(void);
+#else
+static inline int rk_dvfs_init(void){ return 0; }
+#endif
+
+#endif
+

diff --git a/arch/arm/plat-rk/include/plat/dvfs.h b/arch/arm/plat-rk/include/plat/dvfs.h
index 71a6905688fa315bb2b5200da279d773037b9aad..d9f546dd329d1b4f2bd59fad01377d40d2633878 100755 (executable)
--- a/arch/arm/plat-rk/include/plat/dvfs.h
+++ b/arch/arm/plat-rk/include/plat/dvfs.h
@@ -238,12 +238,12 @@ static inline int dvfs_set_arm_logic_volt(struct dvfs_arm_table *dvfs_cpu_logic_
 static inline struct regulator* dvfs_get_regulator(char *regulator_name){ return NULL; }\r
 static inline int dvfs_clk_enable_limit(struct clk *clk, unsigned int min_rate, unsigned max_rate){ return 0; }\r
 static inline int dvfs_clk_disable_limit(struct clk *clk){ return 0; };\r
-int dvfs_scale_volt_direct(struct vd_node *vd_clk, int volt_new){};\r
+static inline int dvfs_scale_volt_direct(struct vd_node *vd_clk, int volt_new){ return 0; };\r
 \r
 static inline void avs_init(void){};\r
 static inline void avs_init_val_get(int index, int vol, char *s){};\r
 static inline int avs_set_scal_val(u8 avs_base){ return 0; };\r
-void avs_board_init(struct avs_ctr_st *data){};\r
+static inline void avs_board_init(struct avs_ctr_st *data){};\r
 #endif\r
 \r
 #endif\r