.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-or-later |
---|
1 | 2 | /* |
---|
2 | 3 | * Ingenic SoC CGU driver |
---|
3 | 4 | * |
---|
4 | 5 | * Copyright (c) 2013-2015 Imagination Technologies |
---|
5 | 6 | * Author: Paul Burton <paul.burton@mips.com> |
---|
6 | | - * |
---|
7 | | - * This program is free software; you can redistribute it and/or |
---|
8 | | - * modify it under the terms of the GNU General Public License as |
---|
9 | | - * published by the Free Software Foundation; either version 2 of |
---|
10 | | - * the License, or (at your option) any later version. |
---|
11 | | - * |
---|
12 | | - * This program is distributed in the hope that it will be useful, |
---|
13 | | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
---|
14 | | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
---|
15 | | - * GNU General Public License for more details. |
---|
16 | 7 | */ |
---|
17 | 8 | |
---|
18 | 9 | #include <linux/bitops.h> |
---|
.. | .. |
---|
20 | 11 | #include <linux/clk-provider.h> |
---|
21 | 12 | #include <linux/clkdev.h> |
---|
22 | 13 | #include <linux/delay.h> |
---|
| 14 | +#include <linux/io.h> |
---|
| 15 | +#include <linux/iopoll.h> |
---|
23 | 16 | #include <linux/math64.h> |
---|
24 | 17 | #include <linux/of.h> |
---|
25 | 18 | #include <linux/of_address.h> |
---|
26 | 19 | #include <linux/slab.h> |
---|
27 | 20 | #include <linux/spinlock.h> |
---|
| 21 | +#include <linux/time.h> |
---|
| 22 | + |
---|
28 | 23 | #include "cgu.h" |
---|
29 | 24 | |
---|
30 | 25 | #define MHZ (1000 * 1000) |
---|
| 26 | + |
---|
| 27 | +static inline const struct ingenic_cgu_clk_info * |
---|
| 28 | +to_clk_info(struct ingenic_clk *clk) |
---|
| 29 | +{ |
---|
| 30 | + return &clk->cgu->clock_info[clk->idx]; |
---|
| 31 | +} |
---|
31 | 32 | |
---|
32 | 33 | /** |
---|
33 | 34 | * ingenic_cgu_gate_get() - get the value of clock gate register bit |
---|
.. | .. |
---|
79 | 80 | ingenic_pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) |
---|
80 | 81 | { |
---|
81 | 82 | struct ingenic_clk *ingenic_clk = to_ingenic_clk(hw); |
---|
| 83 | + const struct ingenic_cgu_clk_info *clk_info = to_clk_info(ingenic_clk); |
---|
82 | 84 | struct ingenic_cgu *cgu = ingenic_clk->cgu; |
---|
83 | | - const struct ingenic_cgu_clk_info *clk_info; |
---|
84 | 85 | const struct ingenic_cgu_pll_info *pll_info; |
---|
85 | 86 | unsigned m, n, od_enc, od; |
---|
86 | | - bool bypass, enable; |
---|
87 | | - unsigned long flags; |
---|
| 87 | + bool bypass; |
---|
88 | 88 | u32 ctl; |
---|
89 | 89 | |
---|
90 | | - clk_info = &cgu->clock_info[ingenic_clk->idx]; |
---|
91 | 90 | BUG_ON(clk_info->type != CGU_CLK_PLL); |
---|
92 | 91 | pll_info = &clk_info->pll; |
---|
93 | 92 | |
---|
94 | | - spin_lock_irqsave(&cgu->lock, flags); |
---|
95 | 93 | ctl = readl(cgu->base + pll_info->reg); |
---|
96 | | - spin_unlock_irqrestore(&cgu->lock, flags); |
---|
97 | 94 | |
---|
98 | 95 | m = (ctl >> pll_info->m_shift) & GENMASK(pll_info->m_bits - 1, 0); |
---|
99 | 96 | m += pll_info->m_offset; |
---|
.. | .. |
---|
101 | 98 | n += pll_info->n_offset; |
---|
102 | 99 | od_enc = ctl >> pll_info->od_shift; |
---|
103 | 100 | od_enc &= GENMASK(pll_info->od_bits - 1, 0); |
---|
| 101 | + |
---|
| 102 | + ctl = readl(cgu->base + pll_info->bypass_reg); |
---|
| 103 | + |
---|
104 | 104 | bypass = !pll_info->no_bypass_bit && |
---|
105 | 105 | !!(ctl & BIT(pll_info->bypass_bit)); |
---|
106 | | - enable = !!(ctl & BIT(pll_info->enable_bit)); |
---|
107 | 106 | |
---|
108 | 107 | if (bypass) |
---|
109 | 108 | return parent_rate; |
---|
.. | .. |
---|
115 | 114 | BUG_ON(od == pll_info->od_max); |
---|
116 | 115 | od++; |
---|
117 | 116 | |
---|
118 | | - return div_u64((u64)parent_rate * m, n * od); |
---|
| 117 | + return div_u64((u64)parent_rate * m * pll_info->rate_multiplier, |
---|
| 118 | + n * od); |
---|
119 | 119 | } |
---|
120 | 120 | |
---|
121 | 121 | static unsigned long |
---|
.. | .. |
---|
148 | 148 | if (pod) |
---|
149 | 149 | *pod = od; |
---|
150 | 150 | |
---|
151 | | - return div_u64((u64)parent_rate * m, n * od); |
---|
152 | | -} |
---|
153 | | - |
---|
154 | | -static inline const struct ingenic_cgu_clk_info *to_clk_info( |
---|
155 | | - struct ingenic_clk *ingenic_clk) |
---|
156 | | -{ |
---|
157 | | - struct ingenic_cgu *cgu = ingenic_clk->cgu; |
---|
158 | | - const struct ingenic_cgu_clk_info *clk_info; |
---|
159 | | - |
---|
160 | | - clk_info = &cgu->clock_info[ingenic_clk->idx]; |
---|
161 | | - BUG_ON(clk_info->type != CGU_CLK_PLL); |
---|
162 | | - |
---|
163 | | - return clk_info; |
---|
| 151 | + return div_u64((u64)parent_rate * m * pll_info->rate_multiplier, |
---|
| 152 | + n * od); |
---|
164 | 153 | } |
---|
165 | 154 | |
---|
166 | 155 | static long |
---|
.. | .. |
---|
173 | 162 | return ingenic_pll_calc(clk_info, req_rate, *prate, NULL, NULL, NULL); |
---|
174 | 163 | } |
---|
175 | 164 | |
---|
| 165 | +static inline int ingenic_pll_check_stable(struct ingenic_cgu *cgu, |
---|
| 166 | + const struct ingenic_cgu_pll_info *pll_info) |
---|
| 167 | +{ |
---|
| 168 | + u32 ctl; |
---|
| 169 | + |
---|
| 170 | + return readl_poll_timeout(cgu->base + pll_info->reg, ctl, |
---|
| 171 | + ctl & BIT(pll_info->stable_bit), |
---|
| 172 | + 0, 100 * USEC_PER_MSEC); |
---|
| 173 | +} |
---|
| 174 | + |
---|
176 | 175 | static int |
---|
177 | 176 | ingenic_pll_set_rate(struct clk_hw *hw, unsigned long req_rate, |
---|
178 | 177 | unsigned long parent_rate) |
---|
.. | .. |
---|
183 | 182 | const struct ingenic_cgu_pll_info *pll_info = &clk_info->pll; |
---|
184 | 183 | unsigned long rate, flags; |
---|
185 | 184 | unsigned int m, n, od; |
---|
| 185 | + int ret = 0; |
---|
186 | 186 | u32 ctl; |
---|
187 | 187 | |
---|
188 | 188 | rate = ingenic_pll_calc(clk_info, req_rate, parent_rate, |
---|
.. | .. |
---|
204 | 204 | ctl |= pll_info->od_encoding[od - 1] << pll_info->od_shift; |
---|
205 | 205 | |
---|
206 | 206 | writel(ctl, cgu->base + pll_info->reg); |
---|
| 207 | + |
---|
| 208 | + /* If the PLL is enabled, verify that it's stable */ |
---|
| 209 | + if (ctl & BIT(pll_info->enable_bit)) |
---|
| 210 | + ret = ingenic_pll_check_stable(cgu, pll_info); |
---|
| 211 | + |
---|
207 | 212 | spin_unlock_irqrestore(&cgu->lock, flags); |
---|
208 | 213 | |
---|
209 | | - return 0; |
---|
| 214 | + return ret; |
---|
210 | 215 | } |
---|
211 | 216 | |
---|
212 | 217 | static int ingenic_pll_enable(struct clk_hw *hw) |
---|
.. | .. |
---|
215 | 220 | struct ingenic_cgu *cgu = ingenic_clk->cgu; |
---|
216 | 221 | const struct ingenic_cgu_clk_info *clk_info = to_clk_info(ingenic_clk); |
---|
217 | 222 | const struct ingenic_cgu_pll_info *pll_info = &clk_info->pll; |
---|
218 | | - const unsigned int timeout = 100; |
---|
219 | 223 | unsigned long flags; |
---|
220 | | - unsigned int i; |
---|
| 224 | + int ret; |
---|
221 | 225 | u32 ctl; |
---|
222 | 226 | |
---|
223 | 227 | spin_lock_irqsave(&cgu->lock, flags); |
---|
224 | | - ctl = readl(cgu->base + pll_info->reg); |
---|
| 228 | + ctl = readl(cgu->base + pll_info->bypass_reg); |
---|
225 | 229 | |
---|
226 | 230 | ctl &= ~BIT(pll_info->bypass_bit); |
---|
| 231 | + |
---|
| 232 | + writel(ctl, cgu->base + pll_info->bypass_reg); |
---|
| 233 | + |
---|
| 234 | + ctl = readl(cgu->base + pll_info->reg); |
---|
| 235 | + |
---|
227 | 236 | ctl |= BIT(pll_info->enable_bit); |
---|
228 | 237 | |
---|
229 | 238 | writel(ctl, cgu->base + pll_info->reg); |
---|
230 | 239 | |
---|
231 | | - /* wait for the PLL to stabilise */ |
---|
232 | | - for (i = 0; i < timeout; i++) { |
---|
233 | | - ctl = readl(cgu->base + pll_info->reg); |
---|
234 | | - if (ctl & BIT(pll_info->stable_bit)) |
---|
235 | | - break; |
---|
236 | | - mdelay(1); |
---|
237 | | - } |
---|
238 | | - |
---|
| 240 | + ret = ingenic_pll_check_stable(cgu, pll_info); |
---|
239 | 241 | spin_unlock_irqrestore(&cgu->lock, flags); |
---|
240 | 242 | |
---|
241 | | - if (i == timeout) |
---|
242 | | - return -EBUSY; |
---|
243 | | - |
---|
244 | | - return 0; |
---|
| 243 | + return ret; |
---|
245 | 244 | } |
---|
246 | 245 | |
---|
247 | 246 | static void ingenic_pll_disable(struct clk_hw *hw) |
---|
.. | .. |
---|
268 | 267 | struct ingenic_cgu *cgu = ingenic_clk->cgu; |
---|
269 | 268 | const struct ingenic_cgu_clk_info *clk_info = to_clk_info(ingenic_clk); |
---|
270 | 269 | const struct ingenic_cgu_pll_info *pll_info = &clk_info->pll; |
---|
271 | | - unsigned long flags; |
---|
272 | 270 | u32 ctl; |
---|
273 | 271 | |
---|
274 | | - spin_lock_irqsave(&cgu->lock, flags); |
---|
275 | 272 | ctl = readl(cgu->base + pll_info->reg); |
---|
276 | | - spin_unlock_irqrestore(&cgu->lock, flags); |
---|
277 | 273 | |
---|
278 | 274 | return !!(ctl & BIT(pll_info->enable_bit)); |
---|
279 | 275 | } |
---|
.. | .. |
---|
295 | 291 | static u8 ingenic_clk_get_parent(struct clk_hw *hw) |
---|
296 | 292 | { |
---|
297 | 293 | struct ingenic_clk *ingenic_clk = to_ingenic_clk(hw); |
---|
| 294 | + const struct ingenic_cgu_clk_info *clk_info = to_clk_info(ingenic_clk); |
---|
298 | 295 | struct ingenic_cgu *cgu = ingenic_clk->cgu; |
---|
299 | | - const struct ingenic_cgu_clk_info *clk_info; |
---|
300 | 296 | u32 reg; |
---|
301 | 297 | u8 i, hw_idx, idx = 0; |
---|
302 | | - |
---|
303 | | - clk_info = &cgu->clock_info[ingenic_clk->idx]; |
---|
304 | 298 | |
---|
305 | 299 | if (clk_info->type & CGU_CLK_MUX) { |
---|
306 | 300 | reg = readl(cgu->base + clk_info->mux.reg); |
---|
.. | .. |
---|
323 | 317 | static int ingenic_clk_set_parent(struct clk_hw *hw, u8 idx) |
---|
324 | 318 | { |
---|
325 | 319 | struct ingenic_clk *ingenic_clk = to_ingenic_clk(hw); |
---|
| 320 | + const struct ingenic_cgu_clk_info *clk_info = to_clk_info(ingenic_clk); |
---|
326 | 321 | struct ingenic_cgu *cgu = ingenic_clk->cgu; |
---|
327 | | - const struct ingenic_cgu_clk_info *clk_info; |
---|
328 | 322 | unsigned long flags; |
---|
329 | 323 | u8 curr_idx, hw_idx, num_poss; |
---|
330 | 324 | u32 reg, mask; |
---|
331 | | - |
---|
332 | | - clk_info = &cgu->clock_info[ingenic_clk->idx]; |
---|
333 | 325 | |
---|
334 | 326 | if (clk_info->type & CGU_CLK_MUX) { |
---|
335 | 327 | /* |
---|
.. | .. |
---|
373 | 365 | ingenic_clk_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) |
---|
374 | 366 | { |
---|
375 | 367 | struct ingenic_clk *ingenic_clk = to_ingenic_clk(hw); |
---|
| 368 | + const struct ingenic_cgu_clk_info *clk_info = to_clk_info(ingenic_clk); |
---|
376 | 369 | struct ingenic_cgu *cgu = ingenic_clk->cgu; |
---|
377 | | - const struct ingenic_cgu_clk_info *clk_info; |
---|
378 | 370 | unsigned long rate = parent_rate; |
---|
379 | 371 | u32 div_reg, div; |
---|
380 | | - |
---|
381 | | - clk_info = &cgu->clock_info[ingenic_clk->idx]; |
---|
382 | 372 | |
---|
383 | 373 | if (clk_info->type & CGU_CLK_DIV) { |
---|
384 | 374 | div_reg = readl(cgu->base + clk_info->div.reg); |
---|
385 | 375 | div = (div_reg >> clk_info->div.shift) & |
---|
386 | 376 | GENMASK(clk_info->div.bits - 1, 0); |
---|
387 | | - div += 1; |
---|
388 | | - div *= clk_info->div.div; |
---|
| 377 | + |
---|
| 378 | + if (clk_info->div.div_table) |
---|
| 379 | + div = clk_info->div.div_table[div]; |
---|
| 380 | + else |
---|
| 381 | + div = (div + 1) * clk_info->div.div; |
---|
389 | 382 | |
---|
390 | 383 | rate /= div; |
---|
391 | 384 | } else if (clk_info->type & CGU_CLK_FIXDIV) { |
---|
.. | .. |
---|
395 | 388 | return rate; |
---|
396 | 389 | } |
---|
397 | 390 | |
---|
| 391 | +static unsigned int |
---|
| 392 | +ingenic_clk_calc_hw_div(const struct ingenic_cgu_clk_info *clk_info, |
---|
| 393 | + unsigned int div) |
---|
| 394 | +{ |
---|
| 395 | + unsigned int i, best_i = 0, best = (unsigned int)-1; |
---|
| 396 | + |
---|
| 397 | + for (i = 0; i < (1 << clk_info->div.bits) |
---|
| 398 | + && clk_info->div.div_table[i]; i++) { |
---|
| 399 | + if (clk_info->div.div_table[i] >= div && |
---|
| 400 | + clk_info->div.div_table[i] < best) { |
---|
| 401 | + best = clk_info->div.div_table[i]; |
---|
| 402 | + best_i = i; |
---|
| 403 | + |
---|
| 404 | + if (div == best) |
---|
| 405 | + break; |
---|
| 406 | + } |
---|
| 407 | + } |
---|
| 408 | + |
---|
| 409 | + return best_i; |
---|
| 410 | +} |
---|
| 411 | + |
---|
398 | 412 | static unsigned |
---|
399 | 413 | ingenic_clk_calc_div(const struct ingenic_cgu_clk_info *clk_info, |
---|
400 | 414 | unsigned long parent_rate, unsigned long req_rate) |
---|
401 | 415 | { |
---|
402 | | - unsigned div; |
---|
| 416 | + unsigned int div, hw_div; |
---|
403 | 417 | |
---|
404 | 418 | /* calculate the divide */ |
---|
405 | 419 | div = DIV_ROUND_UP(parent_rate, req_rate); |
---|
406 | 420 | |
---|
407 | | - /* and impose hardware constraints */ |
---|
408 | | - div = min_t(unsigned, div, 1 << clk_info->div.bits); |
---|
409 | | - div = max_t(unsigned, div, 1); |
---|
| 421 | + if (clk_info->div.div_table) { |
---|
| 422 | + hw_div = ingenic_clk_calc_hw_div(clk_info, div); |
---|
| 423 | + |
---|
| 424 | + return clk_info->div.div_table[hw_div]; |
---|
| 425 | + } |
---|
| 426 | + |
---|
| 427 | + /* Impose hardware constraints */ |
---|
| 428 | + div = clamp_t(unsigned int, div, clk_info->div.div, |
---|
| 429 | + clk_info->div.div << clk_info->div.bits); |
---|
410 | 430 | |
---|
411 | 431 | /* |
---|
412 | 432 | * If the divider value itself must be divided before being written to |
---|
413 | 433 | * the divider register, we must ensure we don't have any bits set that |
---|
414 | 434 | * would be lost as a result of doing so. |
---|
415 | 435 | */ |
---|
416 | | - div /= clk_info->div.div; |
---|
| 436 | + div = DIV_ROUND_UP(div, clk_info->div.div); |
---|
417 | 437 | div *= clk_info->div.div; |
---|
418 | 438 | |
---|
419 | 439 | return div; |
---|
.. | .. |
---|
424 | 444 | unsigned long *parent_rate) |
---|
425 | 445 | { |
---|
426 | 446 | struct ingenic_clk *ingenic_clk = to_ingenic_clk(hw); |
---|
427 | | - struct ingenic_cgu *cgu = ingenic_clk->cgu; |
---|
428 | | - const struct ingenic_cgu_clk_info *clk_info; |
---|
| 447 | + const struct ingenic_cgu_clk_info *clk_info = to_clk_info(ingenic_clk); |
---|
429 | 448 | unsigned int div = 1; |
---|
430 | | - |
---|
431 | | - clk_info = &cgu->clock_info[ingenic_clk->idx]; |
---|
432 | 449 | |
---|
433 | 450 | if (clk_info->type & CGU_CLK_DIV) |
---|
434 | 451 | div = ingenic_clk_calc_div(clk_info, *parent_rate, req_rate); |
---|
435 | 452 | else if (clk_info->type & CGU_CLK_FIXDIV) |
---|
436 | 453 | div = clk_info->fixdiv.div; |
---|
| 454 | + else if (clk_hw_can_set_rate_parent(hw)) |
---|
| 455 | + *parent_rate = req_rate; |
---|
437 | 456 | |
---|
438 | 457 | return DIV_ROUND_UP(*parent_rate, div); |
---|
| 458 | +} |
---|
| 459 | + |
---|
| 460 | +static inline int ingenic_clk_check_stable(struct ingenic_cgu *cgu, |
---|
| 461 | + const struct ingenic_cgu_clk_info *clk_info) |
---|
| 462 | +{ |
---|
| 463 | + u32 reg; |
---|
| 464 | + |
---|
| 465 | + return readl_poll_timeout(cgu->base + clk_info->div.reg, reg, |
---|
| 466 | + !(reg & BIT(clk_info->div.busy_bit)), |
---|
| 467 | + 0, 100 * USEC_PER_MSEC); |
---|
439 | 468 | } |
---|
440 | 469 | |
---|
441 | 470 | static int |
---|
.. | .. |
---|
443 | 472 | unsigned long parent_rate) |
---|
444 | 473 | { |
---|
445 | 474 | struct ingenic_clk *ingenic_clk = to_ingenic_clk(hw); |
---|
| 475 | + const struct ingenic_cgu_clk_info *clk_info = to_clk_info(ingenic_clk); |
---|
446 | 476 | struct ingenic_cgu *cgu = ingenic_clk->cgu; |
---|
447 | | - const struct ingenic_cgu_clk_info *clk_info; |
---|
448 | | - const unsigned timeout = 100; |
---|
449 | 477 | unsigned long rate, flags; |
---|
450 | | - unsigned div, i; |
---|
| 478 | + unsigned int hw_div, div; |
---|
451 | 479 | u32 reg, mask; |
---|
452 | 480 | int ret = 0; |
---|
453 | | - |
---|
454 | | - clk_info = &cgu->clock_info[ingenic_clk->idx]; |
---|
455 | 481 | |
---|
456 | 482 | if (clk_info->type & CGU_CLK_DIV) { |
---|
457 | 483 | div = ingenic_clk_calc_div(clk_info, parent_rate, req_rate); |
---|
.. | .. |
---|
460 | 486 | if (rate != req_rate) |
---|
461 | 487 | return -EINVAL; |
---|
462 | 488 | |
---|
| 489 | + if (clk_info->div.div_table) |
---|
| 490 | + hw_div = ingenic_clk_calc_hw_div(clk_info, div); |
---|
| 491 | + else |
---|
| 492 | + hw_div = ((div / clk_info->div.div) - 1); |
---|
| 493 | + |
---|
463 | 494 | spin_lock_irqsave(&cgu->lock, flags); |
---|
464 | 495 | reg = readl(cgu->base + clk_info->div.reg); |
---|
465 | 496 | |
---|
466 | 497 | /* update the divide */ |
---|
467 | 498 | mask = GENMASK(clk_info->div.bits - 1, 0); |
---|
468 | 499 | reg &= ~(mask << clk_info->div.shift); |
---|
469 | | - reg |= ((div / clk_info->div.div) - 1) << clk_info->div.shift; |
---|
| 500 | + reg |= hw_div << clk_info->div.shift; |
---|
470 | 501 | |
---|
471 | 502 | /* clear the stop bit */ |
---|
472 | 503 | if (clk_info->div.stop_bit != -1) |
---|
.. | .. |
---|
480 | 511 | writel(reg, cgu->base + clk_info->div.reg); |
---|
481 | 512 | |
---|
482 | 513 | /* wait for the change to take effect */ |
---|
483 | | - if (clk_info->div.busy_bit != -1) { |
---|
484 | | - for (i = 0; i < timeout; i++) { |
---|
485 | | - reg = readl(cgu->base + clk_info->div.reg); |
---|
486 | | - if (!(reg & BIT(clk_info->div.busy_bit))) |
---|
487 | | - break; |
---|
488 | | - mdelay(1); |
---|
489 | | - } |
---|
490 | | - if (i == timeout) |
---|
491 | | - ret = -EBUSY; |
---|
492 | | - } |
---|
| 514 | + if (clk_info->div.busy_bit != -1) |
---|
| 515 | + ret = ingenic_clk_check_stable(cgu, clk_info); |
---|
493 | 516 | |
---|
494 | 517 | spin_unlock_irqrestore(&cgu->lock, flags); |
---|
495 | 518 | return ret; |
---|
.. | .. |
---|
501 | 524 | static int ingenic_clk_enable(struct clk_hw *hw) |
---|
502 | 525 | { |
---|
503 | 526 | struct ingenic_clk *ingenic_clk = to_ingenic_clk(hw); |
---|
| 527 | + const struct ingenic_cgu_clk_info *clk_info = to_clk_info(ingenic_clk); |
---|
504 | 528 | struct ingenic_cgu *cgu = ingenic_clk->cgu; |
---|
505 | | - const struct ingenic_cgu_clk_info *clk_info; |
---|
506 | 529 | unsigned long flags; |
---|
507 | | - |
---|
508 | | - clk_info = &cgu->clock_info[ingenic_clk->idx]; |
---|
509 | 530 | |
---|
510 | 531 | if (clk_info->type & CGU_CLK_GATE) { |
---|
511 | 532 | /* ungate the clock */ |
---|
.. | .. |
---|
523 | 544 | static void ingenic_clk_disable(struct clk_hw *hw) |
---|
524 | 545 | { |
---|
525 | 546 | struct ingenic_clk *ingenic_clk = to_ingenic_clk(hw); |
---|
| 547 | + const struct ingenic_cgu_clk_info *clk_info = to_clk_info(ingenic_clk); |
---|
526 | 548 | struct ingenic_cgu *cgu = ingenic_clk->cgu; |
---|
527 | | - const struct ingenic_cgu_clk_info *clk_info; |
---|
528 | 549 | unsigned long flags; |
---|
529 | | - |
---|
530 | | - clk_info = &cgu->clock_info[ingenic_clk->idx]; |
---|
531 | 550 | |
---|
532 | 551 | if (clk_info->type & CGU_CLK_GATE) { |
---|
533 | 552 | /* gate the clock */ |
---|
.. | .. |
---|
540 | 559 | static int ingenic_clk_is_enabled(struct clk_hw *hw) |
---|
541 | 560 | { |
---|
542 | 561 | struct ingenic_clk *ingenic_clk = to_ingenic_clk(hw); |
---|
| 562 | + const struct ingenic_cgu_clk_info *clk_info = to_clk_info(ingenic_clk); |
---|
543 | 563 | struct ingenic_cgu *cgu = ingenic_clk->cgu; |
---|
544 | | - const struct ingenic_cgu_clk_info *clk_info; |
---|
545 | | - unsigned long flags; |
---|
546 | 564 | int enabled = 1; |
---|
547 | 565 | |
---|
548 | | - clk_info = &cgu->clock_info[ingenic_clk->idx]; |
---|
549 | | - |
---|
550 | | - if (clk_info->type & CGU_CLK_GATE) { |
---|
551 | | - spin_lock_irqsave(&cgu->lock, flags); |
---|
| 566 | + if (clk_info->type & CGU_CLK_GATE) |
---|
552 | 567 | enabled = !ingenic_cgu_gate_get(cgu, &clk_info->gate); |
---|
553 | | - spin_unlock_irqrestore(&cgu->lock, flags); |
---|
554 | | - } |
---|
555 | 568 | |
---|
556 | 569 | return enabled; |
---|
557 | 570 | } |
---|
.. | .. |
---|
624 | 637 | |
---|
625 | 638 | caps = clk_info->type; |
---|
626 | 639 | |
---|
| 640 | + if (caps & CGU_CLK_DIV) { |
---|
| 641 | + caps &= ~CGU_CLK_DIV; |
---|
| 642 | + } else if (!(caps & CGU_CLK_CUSTOM)) { |
---|
| 643 | + /* pass rate changes to the parent clock */ |
---|
| 644 | + clk_init.flags |= CLK_SET_RATE_PARENT; |
---|
| 645 | + } |
---|
| 646 | + |
---|
627 | 647 | if (caps & (CGU_CLK_MUX | CGU_CLK_CUSTOM)) { |
---|
628 | 648 | clk_init.num_parents = 0; |
---|
629 | 649 | |
---|
.. | .. |
---|
663 | 683 | } |
---|
664 | 684 | } else if (caps & CGU_CLK_PLL) { |
---|
665 | 685 | clk_init.ops = &ingenic_pll_ops; |
---|
666 | | - clk_init.flags |= CLK_SET_RATE_GATE; |
---|
667 | 686 | |
---|
668 | 687 | caps &= ~CGU_CLK_PLL; |
---|
669 | 688 | |
---|
.. | .. |
---|
684 | 703 | clk_init.flags |= CLK_SET_PARENT_GATE; |
---|
685 | 704 | |
---|
686 | 705 | caps &= ~(CGU_CLK_MUX | CGU_CLK_MUX_GLITCHFREE); |
---|
687 | | - } |
---|
688 | | - |
---|
689 | | - if (caps & CGU_CLK_DIV) { |
---|
690 | | - caps &= ~CGU_CLK_DIV; |
---|
691 | | - } else { |
---|
692 | | - /* pass rate changes to the parent clock */ |
---|
693 | | - clk_init.flags |= CLK_SET_RATE_PARENT; |
---|
694 | 706 | } |
---|
695 | 707 | |
---|
696 | 708 | if (caps) { |
---|