Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ARM: omap2: simplify clock2xxx header
Only one of the functions in clock2xxx.h is used in a file
other than the one it is declared in, so remove the extra
declarations, and make the symbols static.
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+9
-40
+1
arch/arm/mach-omap2/clkt2xxx_dpllcore.c
+1
arch/arm/mach-omap2/clkt2xxx_dpllcore.c
+8
-6
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
+8
-6
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
···
39
39
#include "sdrc.h"
40
40
#include "sram.h"
41
41
42
+
static u16 cpu_mask;
43
+
42
44
const struct prcm_config *curr_prcm_set;
43
45
const struct prcm_config *rate_table;
44
46
···
57
55
*
58
56
* Set virt_prcm_set's rate to the mpu_speed field of the current PRCM set.
59
57
*/
60
-
unsigned long omap2_table_mpu_recalc(struct clk_hw *clk,
58
+
static unsigned long omap2_table_mpu_recalc(struct clk_hw *clk,
61
59
unsigned long parent_rate)
62
60
{
63
61
return curr_prcm_set->mpu_speed;
···
70
68
* Some might argue L3-DDR, others ARM, others IVA. This code is simple and
71
69
* just uses the ARM rates.
72
70
*/
73
-
long omap2_round_to_table_rate(struct clk_hw *hw, unsigned long rate,
71
+
static long omap2_round_to_table_rate(struct clk_hw *hw, unsigned long rate,
74
72
unsigned long *parent_rate)
75
73
{
76
74
const struct prcm_config *ptr;
···
94
92
}
95
93
96
94
/* Sets basic clocks based on the specified rate */
97
-
int omap2_select_table_rate(struct clk_hw *hw, unsigned long rate,
98
-
unsigned long parent_rate)
95
+
static int omap2_select_table_rate(struct clk_hw *hw, unsigned long rate,
96
+
unsigned long parent_rate)
99
97
{
100
98
u32 cur_rate, done_rate, bypass = 0;
101
99
const struct prcm_config *prcm;
···
169
167
* global to point to the active rate set when found; otherwise, sets
170
168
* it to NULL. No return value;
171
169
*/
172
-
void omap2xxx_clkt_vps_check_bootloader_rates(void)
170
+
static void omap2xxx_clkt_vps_check_bootloader_rates(void)
173
171
{
174
172
const struct prcm_config *prcm = NULL;
175
173
unsigned long rate;
···
195
193
* sys_ck rate, but before the virt_prcm_set clock rate is
196
194
* recalculated. No return value.
197
195
*/
198
-
void omap2xxx_clkt_vps_late_init(void)
196
+
static void omap2xxx_clkt_vps_late_init(void)
199
197
{
200
198
struct clk *c;
201
199
-2
arch/arm/mach-omap2/clock.c
-2
arch/arm/mach-omap2/clock.c
-2
arch/arm/mach-omap2/clock.h
-2
arch/arm/mach-omap2/clock.h
-29
arch/arm/mach-omap2/clock2xxx.h
-29
arch/arm/mach-omap2/clock2xxx.h
···
12
12
#include <linux/clk-provider.h>
13
13
#include "clock.h"
14
14
15
-
unsigned long omap2_table_mpu_recalc(struct clk_hw *clk,
16
-
unsigned long parent_rate);
17
-
int omap2_select_table_rate(struct clk_hw *hw, unsigned long rate,
18
-
unsigned long parent_rate);
19
-
long omap2_round_to_table_rate(struct clk_hw *hw, unsigned long rate,
20
-
unsigned long *parent_rate);
21
-
unsigned long omap2xxx_sys_clk_recalc(struct clk_hw *clk,
22
-
unsigned long parent_rate);
23
-
unsigned long omap2_osc_clk_recalc(struct clk_hw *clk,
24
-
unsigned long parent_rate);
25
-
void omap2xxx_clkt_dpllcore_init(struct clk_hw *hw);
26
15
unsigned long omap2xxx_clk_get_core_rate(void);
27
-
u32 omap2xxx_get_sysclkdiv(void);
28
-
void omap2xxx_clk_prepare_for_reboot(void);
29
-
void omap2xxx_clkt_vps_check_bootloader_rates(void);
30
-
void omap2xxx_clkt_vps_late_init(void);
31
-
32
-
#ifdef CONFIG_SOC_OMAP2420
33
-
int omap2420_clk_init(void);
34
-
#else
35
-
#define omap2420_clk_init() do { } while(0)
36
-
#endif
37
-
38
-
#ifdef CONFIG_SOC_OMAP2430
39
-
int omap2430_clk_init(void);
40
-
#else
41
-
#define omap2430_clk_init() do { } while(0)
42
-
#endif
43
-
44
-
extern struct clk_hw *dclk_hw;
45
16
46
17
#endif