diff options
Diffstat (limited to 'arch/arm/mach-s5pv210/clock.c')
-rw-r--r-- | arch/arm/mach-s5pv210/clock.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c index 4791642f3e6e..527c9c4262f1 100644 --- a/arch/arm/mach-s5pv210/clock.c +++ b/arch/arm/mach-s5pv210/clock.c | |||
@@ -155,11 +155,6 @@ static int s5pv210_clk_ip3_ctrl(struct clk *clk, int enable) | |||
155 | return s5p_gatectrl(S5P_CLKGATE_IP3, clk, enable); | 155 | return s5p_gatectrl(S5P_CLKGATE_IP3, clk, enable); |
156 | } | 156 | } |
157 | 157 | ||
158 | static struct clk clk_h100 = { | ||
159 | .name = "hclk100", | ||
160 | .id = -1, | ||
161 | }; | ||
162 | |||
163 | static struct clk clk_p83 = { | 158 | static struct clk clk_p83 = { |
164 | .name = "pclk83", | 159 | .name = "pclk83", |
165 | .id = -1, | 160 | .id = -1, |
@@ -171,11 +166,19 @@ static struct clk clk_p66 = { | |||
171 | }; | 166 | }; |
172 | 167 | ||
173 | static struct clk *sys_clks[] = { | 168 | static struct clk *sys_clks[] = { |
174 | &clk_h100, | ||
175 | &clk_p83, | 169 | &clk_p83, |
176 | &clk_p66 | 170 | &clk_p66 |
177 | }; | 171 | }; |
178 | 172 | ||
173 | static unsigned long s5pv210_clk_imem_get_rate(struct clk *clk) | ||
174 | { | ||
175 | return clk_get_rate(clk->parent) / 2; | ||
176 | } | ||
177 | |||
178 | static struct clk_ops clk_hclk_imem_ops = { | ||
179 | .get_rate = s5pv210_clk_imem_get_rate, | ||
180 | }; | ||
181 | |||
179 | static struct clk init_clocks_disable[] = { | 182 | static struct clk init_clocks_disable[] = { |
180 | { | 183 | { |
181 | .name = "rot", | 184 | .name = "rot", |
@@ -326,6 +329,13 @@ static struct clk init_clocks_disable[] = { | |||
326 | 329 | ||
327 | static struct clk init_clocks[] = { | 330 | static struct clk init_clocks[] = { |
328 | { | 331 | { |
332 | .name = "hclk_imem", | ||
333 | .id = -1, | ||
334 | .parent = &clk_hclk_msys.clk, | ||
335 | .ctrlbit = (1 << 5), | ||
336 | .enable = s5pv210_clk_ip0_ctrl, | ||
337 | .ops = &clk_hclk_imem_ops, | ||
338 | }, { | ||
329 | .name = "uart", | 339 | .name = "uart", |
330 | .id = 0, | 340 | .id = 0, |
331 | .parent = &clk_p66, | 341 | .parent = &clk_p66, |