diff options
Diffstat (limited to 'arch/arm/mach-s5pv210/clock.c')
-rw-r--r-- | arch/arm/mach-s5pv210/clock.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c index af91fefef2c6..d562670e1b0b 100644 --- a/arch/arm/mach-s5pv210/clock.c +++ b/arch/arm/mach-s5pv210/clock.c | |||
@@ -173,11 +173,6 @@ static int s5pv210_clk_ip3_ctrl(struct clk *clk, int enable) | |||
173 | return s5p_gatectrl(S5P_CLKGATE_IP3, clk, enable); | 173 | return s5p_gatectrl(S5P_CLKGATE_IP3, clk, enable); |
174 | } | 174 | } |
175 | 175 | ||
176 | static int s5pv210_clk_ip4_ctrl(struct clk *clk, int enable) | ||
177 | { | ||
178 | return s5p_gatectrl(S5P_CLKGATE_IP4, clk, enable); | ||
179 | } | ||
180 | |||
181 | static int s5pv210_clk_mask0_ctrl(struct clk *clk, int enable) | 176 | static int s5pv210_clk_mask0_ctrl(struct clk *clk, int enable) |
182 | { | 177 | { |
183 | return s5p_gatectrl(S5P_CLK_SRC_MASK0, clk, enable); | 178 | return s5p_gatectrl(S5P_CLK_SRC_MASK0, clk, enable); |
@@ -281,6 +276,24 @@ static struct clk init_clocks_disable[] = { | |||
281 | .enable = s5pv210_clk_ip0_ctrl, | 276 | .enable = s5pv210_clk_ip0_ctrl, |
282 | .ctrlbit = (1<<29), | 277 | .ctrlbit = (1<<29), |
283 | }, { | 278 | }, { |
279 | .name = "fimc", | ||
280 | .id = 0, | ||
281 | .parent = &clk_hclk_dsys.clk, | ||
282 | .enable = s5pv210_clk_ip0_ctrl, | ||
283 | .ctrlbit = (1 << 24), | ||
284 | }, { | ||
285 | .name = "fimc", | ||
286 | .id = 1, | ||
287 | .parent = &clk_hclk_dsys.clk, | ||
288 | .enable = s5pv210_clk_ip0_ctrl, | ||
289 | .ctrlbit = (1 << 25), | ||
290 | }, { | ||
291 | .name = "fimc", | ||
292 | .id = 2, | ||
293 | .parent = &clk_hclk_dsys.clk, | ||
294 | .enable = s5pv210_clk_ip0_ctrl, | ||
295 | .ctrlbit = (1 << 26), | ||
296 | }, { | ||
284 | .name = "otg", | 297 | .name = "otg", |
285 | .id = -1, | 298 | .id = -1, |
286 | .parent = &clk_hclk_psys.clk, | 299 | .parent = &clk_hclk_psys.clk, |
@@ -357,7 +370,7 @@ static struct clk init_clocks_disable[] = { | |||
357 | .id = 1, | 370 | .id = 1, |
358 | .parent = &clk_pclk_psys.clk, | 371 | .parent = &clk_pclk_psys.clk, |
359 | .enable = s5pv210_clk_ip3_ctrl, | 372 | .enable = s5pv210_clk_ip3_ctrl, |
360 | .ctrlbit = (1<<8), | 373 | .ctrlbit = (1 << 10), |
361 | }, { | 374 | }, { |
362 | .name = "i2c", | 375 | .name = "i2c", |
363 | .id = 2, | 376 | .id = 2, |