diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-01-20 21:29:30 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-01-20 23:06:10 -0500 |
commit | 15545026ad615e15bd9457941a66c8a6d5387fe4 (patch) | |
tree | fa42257d3a5ca35a9c3291516a7b45f8709334f1 | |
parent | 5086c6c882a392d2f48704c0a03e17bdcbf01e8f (diff) |
ARM: S5P64X0: use static declaration when it is not used in other files
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | arch/arm/mach-s5p64x0/clock.c | 11 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/dma.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h | 7 |
3 files changed, 11 insertions, 17 deletions
diff --git a/arch/arm/mach-s5p64x0/clock.c b/arch/arm/mach-s5p64x0/clock.c index 241d0e645c85..57e718957ef3 100644 --- a/arch/arm/mach-s5p64x0/clock.c +++ b/arch/arm/mach-s5p64x0/clock.c | |||
@@ -73,7 +73,7 @@ static const u32 clock_table[][3] = { | |||
73 | {L2 * 1000, (3 << ARM_DIV_RATIO_SHIFT), (0 << S5P64X0_CLKDIV0_HCLK_SHIFT)}, | 73 | {L2 * 1000, (3 << ARM_DIV_RATIO_SHIFT), (0 << S5P64X0_CLKDIV0_HCLK_SHIFT)}, |
74 | }; | 74 | }; |
75 | 75 | ||
76 | unsigned long s5p64x0_armclk_get_rate(struct clk *clk) | 76 | static unsigned long s5p64x0_armclk_get_rate(struct clk *clk) |
77 | { | 77 | { |
78 | unsigned long rate = clk_get_rate(clk->parent); | 78 | unsigned long rate = clk_get_rate(clk->parent); |
79 | u32 clkdiv; | 79 | u32 clkdiv; |
@@ -84,7 +84,8 @@ unsigned long s5p64x0_armclk_get_rate(struct clk *clk) | |||
84 | return rate / (clkdiv + 1); | 84 | return rate / (clkdiv + 1); |
85 | } | 85 | } |
86 | 86 | ||
87 | unsigned long s5p64x0_armclk_round_rate(struct clk *clk, unsigned long rate) | 87 | static unsigned long s5p64x0_armclk_round_rate(struct clk *clk, |
88 | unsigned long rate) | ||
88 | { | 89 | { |
89 | u32 iter; | 90 | u32 iter; |
90 | 91 | ||
@@ -96,7 +97,7 @@ unsigned long s5p64x0_armclk_round_rate(struct clk *clk, unsigned long rate) | |||
96 | return clock_table[ARRAY_SIZE(clock_table) - 1][0]; | 97 | return clock_table[ARRAY_SIZE(clock_table) - 1][0]; |
97 | } | 98 | } |
98 | 99 | ||
99 | int s5p64x0_armclk_set_rate(struct clk *clk, unsigned long rate) | 100 | static int s5p64x0_armclk_set_rate(struct clk *clk, unsigned long rate) |
100 | { | 101 | { |
101 | u32 round_tmp; | 102 | u32 round_tmp; |
102 | u32 iter; | 103 | u32 iter; |
@@ -148,7 +149,7 @@ int s5p64x0_armclk_set_rate(struct clk *clk, unsigned long rate) | |||
148 | return 0; | 149 | return 0; |
149 | } | 150 | } |
150 | 151 | ||
151 | struct clk_ops s5p64x0_clkarm_ops = { | 152 | static struct clk_ops s5p64x0_clkarm_ops = { |
152 | .get_rate = s5p64x0_armclk_get_rate, | 153 | .get_rate = s5p64x0_armclk_get_rate, |
153 | .set_rate = s5p64x0_armclk_set_rate, | 154 | .set_rate = s5p64x0_armclk_set_rate, |
154 | .round_rate = s5p64x0_armclk_round_rate, | 155 | .round_rate = s5p64x0_armclk_round_rate, |
@@ -173,7 +174,7 @@ struct clksrc_clk clk_dout_mpll = { | |||
173 | .reg_div = { .reg = S5P64X0_CLK_DIV0, .shift = 4, .size = 1 }, | 174 | .reg_div = { .reg = S5P64X0_CLK_DIV0, .shift = 4, .size = 1 }, |
174 | }; | 175 | }; |
175 | 176 | ||
176 | struct clk *clkset_hclk_low_list[] = { | 177 | static struct clk *clkset_hclk_low_list[] = { |
177 | &clk_mout_apll.clk, | 178 | &clk_mout_apll.clk, |
178 | &clk_mout_mpll.clk, | 179 | &clk_mout_mpll.clk, |
179 | }; | 180 | }; |
diff --git a/arch/arm/mach-s5p64x0/dma.c b/arch/arm/mach-s5p64x0/dma.c index f820c0744405..8fce11616476 100644 --- a/arch/arm/mach-s5p64x0/dma.c +++ b/arch/arm/mach-s5p64x0/dma.c | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | static u64 dma_dmamask = DMA_BIT_MASK(32); | 39 | static u64 dma_dmamask = DMA_BIT_MASK(32); |
40 | 40 | ||
41 | u8 s5p6440_pdma_peri[] = { | 41 | static u8 s5p6440_pdma_peri[] = { |
42 | DMACH_UART0_RX, | 42 | DMACH_UART0_RX, |
43 | DMACH_UART0_TX, | 43 | DMACH_UART0_TX, |
44 | DMACH_UART1_RX, | 44 | DMACH_UART1_RX, |
@@ -63,12 +63,12 @@ u8 s5p6440_pdma_peri[] = { | |||
63 | DMACH_SPI1_RX, | 63 | DMACH_SPI1_RX, |
64 | }; | 64 | }; |
65 | 65 | ||
66 | struct dma_pl330_platdata s5p6440_pdma_pdata = { | 66 | static struct dma_pl330_platdata s5p6440_pdma_pdata = { |
67 | .nr_valid_peri = ARRAY_SIZE(s5p6440_pdma_peri), | 67 | .nr_valid_peri = ARRAY_SIZE(s5p6440_pdma_peri), |
68 | .peri_id = s5p6440_pdma_peri, | 68 | .peri_id = s5p6440_pdma_peri, |
69 | }; | 69 | }; |
70 | 70 | ||
71 | u8 s5p6450_pdma_peri[] = { | 71 | static u8 s5p6450_pdma_peri[] = { |
72 | DMACH_UART0_RX, | 72 | DMACH_UART0_RX, |
73 | DMACH_UART0_TX, | 73 | DMACH_UART0_TX, |
74 | DMACH_UART1_RX, | 74 | DMACH_UART1_RX, |
@@ -103,12 +103,12 @@ u8 s5p6450_pdma_peri[] = { | |||
103 | DMACH_UART5_TX, | 103 | DMACH_UART5_TX, |
104 | }; | 104 | }; |
105 | 105 | ||
106 | struct dma_pl330_platdata s5p6450_pdma_pdata = { | 106 | static struct dma_pl330_platdata s5p6450_pdma_pdata = { |
107 | .nr_valid_peri = ARRAY_SIZE(s5p6450_pdma_peri), | 107 | .nr_valid_peri = ARRAY_SIZE(s5p6450_pdma_peri), |
108 | .peri_id = s5p6450_pdma_peri, | 108 | .peri_id = s5p6450_pdma_peri, |
109 | }; | 109 | }; |
110 | 110 | ||
111 | struct amba_device s5p64x0_device_pdma = { | 111 | static struct amba_device s5p64x0_device_pdma = { |
112 | .dev = { | 112 | .dev = { |
113 | .init_name = "dma-pl330", | 113 | .init_name = "dma-pl330", |
114 | .dma_mask = &dma_dmamask, | 114 | .dma_mask = &dma_dmamask, |
diff --git a/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h b/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h index ff85b4b6e8d9..0ef47d1b7670 100644 --- a/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h +++ b/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h | |||
@@ -22,16 +22,9 @@ extern struct clksrc_clk clk_mout_epll; | |||
22 | extern int s5p64x0_epll_enable(struct clk *clk, int enable); | 22 | extern int s5p64x0_epll_enable(struct clk *clk, int enable); |
23 | extern unsigned long s5p64x0_epll_get_rate(struct clk *clk); | 23 | extern unsigned long s5p64x0_epll_get_rate(struct clk *clk); |
24 | 24 | ||
25 | extern unsigned long s5p64x0_armclk_get_rate(struct clk *clk); | ||
26 | extern unsigned long s5p64x0_armclk_round_rate(struct clk *clk, unsigned long rate); | ||
27 | extern int s5p64x0_armclk_set_rate(struct clk *clk, unsigned long rate); | ||
28 | |||
29 | extern struct clk_ops s5p64x0_clkarm_ops; | ||
30 | |||
31 | extern struct clksrc_clk clk_armclk; | 25 | extern struct clksrc_clk clk_armclk; |
32 | extern struct clksrc_clk clk_dout_mpll; | 26 | extern struct clksrc_clk clk_dout_mpll; |
33 | 27 | ||
34 | extern struct clk *clkset_hclk_low_list[]; | ||
35 | extern struct clksrc_sources clkset_hclk_low; | 28 | extern struct clksrc_sources clkset_hclk_low; |
36 | 29 | ||
37 | extern int s5p64x0_pclk_ctrl(struct clk *clk, int enable); | 30 | extern int s5p64x0_pclk_ctrl(struct clk *clk, int enable); |