diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-18 09:06:02 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-20 18:52:16 -0400 |
commit | 9e23552f8ecf85cd4a74741051ed2cfbab630164 (patch) | |
tree | b4cd6c2fee5afd50a317af959d479e1ea2d2516f | |
parent | a6aa7a55848ff84b2f296ad30726f0e1ebc5f0ea (diff) |
ARM: S5PV310: Adds clkset_aclk for removing clkset_aclk_xxx
This patch adds 'clkset_aclk' to use commonly. And removed struct
clksrc_sources clkset_aclk_200, clkset_aclk_100, clkset_aclk_160,
and clkset_aclk_133.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | arch/arm/mach-s5pv310/clock.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/arch/arm/mach-s5pv310/clock.c b/arch/arm/mach-s5pv310/clock.c index 823c29f68067..20f35138a193 100644 --- a/arch/arm/mach-s5pv310/clock.c +++ b/arch/arm/mach-s5pv310/clock.c | |||
@@ -223,7 +223,7 @@ static struct clk *clkset_aclk_top_list[] = { | |||
223 | [1] = &clk_sclk_apll.clk, | 223 | [1] = &clk_sclk_apll.clk, |
224 | }; | 224 | }; |
225 | 225 | ||
226 | static struct clksrc_sources clkset_aclk_200 = { | 226 | static struct clksrc_sources clkset_aclk = { |
227 | .sources = clkset_aclk_top_list, | 227 | .sources = clkset_aclk_top_list, |
228 | .nr_sources = ARRAY_SIZE(clkset_aclk_top_list), | 228 | .nr_sources = ARRAY_SIZE(clkset_aclk_top_list), |
229 | }; | 229 | }; |
@@ -233,52 +233,37 @@ static struct clksrc_clk clk_aclk_200 = { | |||
233 | .name = "aclk_200", | 233 | .name = "aclk_200", |
234 | .id = -1, | 234 | .id = -1, |
235 | }, | 235 | }, |
236 | .sources = &clkset_aclk_200, | 236 | .sources = &clkset_aclk, |
237 | .reg_src = { .reg = S5P_CLKSRC_TOP0, .shift = 12, .size = 1 }, | 237 | .reg_src = { .reg = S5P_CLKSRC_TOP0, .shift = 12, .size = 1 }, |
238 | .reg_div = { .reg = S5P_CLKDIV_TOP, .shift = 0, .size = 3 }, | 238 | .reg_div = { .reg = S5P_CLKDIV_TOP, .shift = 0, .size = 3 }, |
239 | }; | 239 | }; |
240 | 240 | ||
241 | static struct clksrc_sources clkset_aclk_100 = { | ||
242 | .sources = clkset_aclk_top_list, | ||
243 | .nr_sources = ARRAY_SIZE(clkset_aclk_top_list), | ||
244 | }; | ||
245 | |||
246 | static struct clksrc_clk clk_aclk_100 = { | 241 | static struct clksrc_clk clk_aclk_100 = { |
247 | .clk = { | 242 | .clk = { |
248 | .name = "aclk_100", | 243 | .name = "aclk_100", |
249 | .id = -1, | 244 | .id = -1, |
250 | }, | 245 | }, |
251 | .sources = &clkset_aclk_100, | 246 | .sources = &clkset_aclk, |
252 | .reg_src = { .reg = S5P_CLKSRC_TOP0, .shift = 16, .size = 1 }, | 247 | .reg_src = { .reg = S5P_CLKSRC_TOP0, .shift = 16, .size = 1 }, |
253 | .reg_div = { .reg = S5P_CLKDIV_TOP, .shift = 4, .size = 4 }, | 248 | .reg_div = { .reg = S5P_CLKDIV_TOP, .shift = 4, .size = 4 }, |
254 | }; | 249 | }; |
255 | 250 | ||
256 | static struct clksrc_sources clkset_aclk_160 = { | ||
257 | .sources = clkset_aclk_top_list, | ||
258 | .nr_sources = ARRAY_SIZE(clkset_aclk_top_list), | ||
259 | }; | ||
260 | |||
261 | static struct clksrc_clk clk_aclk_160 = { | 251 | static struct clksrc_clk clk_aclk_160 = { |
262 | .clk = { | 252 | .clk = { |
263 | .name = "aclk_160", | 253 | .name = "aclk_160", |
264 | .id = -1, | 254 | .id = -1, |
265 | }, | 255 | }, |
266 | .sources = &clkset_aclk_160, | 256 | .sources = &clkset_aclk, |
267 | .reg_src = { .reg = S5P_CLKSRC_TOP0, .shift = 20, .size = 1 }, | 257 | .reg_src = { .reg = S5P_CLKSRC_TOP0, .shift = 20, .size = 1 }, |
268 | .reg_div = { .reg = S5P_CLKDIV_TOP, .shift = 8, .size = 3 }, | 258 | .reg_div = { .reg = S5P_CLKDIV_TOP, .shift = 8, .size = 3 }, |
269 | }; | 259 | }; |
270 | 260 | ||
271 | static struct clksrc_sources clkset_aclk_133 = { | ||
272 | .sources = clkset_aclk_top_list, | ||
273 | .nr_sources = ARRAY_SIZE(clkset_aclk_top_list), | ||
274 | }; | ||
275 | |||
276 | static struct clksrc_clk clk_aclk_133 = { | 261 | static struct clksrc_clk clk_aclk_133 = { |
277 | .clk = { | 262 | .clk = { |
278 | .name = "aclk_133", | 263 | .name = "aclk_133", |
279 | .id = -1, | 264 | .id = -1, |
280 | }, | 265 | }, |
281 | .sources = &clkset_aclk_133, | 266 | .sources = &clkset_aclk, |
282 | .reg_src = { .reg = S5P_CLKSRC_TOP0, .shift = 24, .size = 1 }, | 267 | .reg_src = { .reg = S5P_CLKSRC_TOP0, .shift = 24, .size = 1 }, |
283 | .reg_div = { .reg = S5P_CLKDIV_TOP, .shift = 12, .size = 3 }, | 268 | .reg_div = { .reg = S5P_CLKDIV_TOP, .shift = 12, .size = 3 }, |
284 | }; | 269 | }; |