projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
dpll3xxx.c
diff --git
a/arch/arm/mach-omap2/dpll3xxx.c
b/arch/arm/mach-omap2/dpll3xxx.c
index
20e120d
..
c2da2a0
100644
(file)
--- a/
arch/arm/mach-omap2/dpll3xxx.c
+++ b/
arch/arm/mach-omap2/dpll3xxx.c
@@
-474,7
+474,7
@@
void omap3_noncore_dpll_disable(struct clk_hw *hw)
*/
long omap3_noncore_dpll_determine_rate(struct clk_hw *hw, unsigned long rate,
unsigned long *best_parent_rate,
*/
long omap3_noncore_dpll_determine_rate(struct clk_hw *hw, unsigned long rate,
unsigned long *best_parent_rate,
- struct clk **best_parent_clk)
+ struct clk
_hw
**best_parent_clk)
{
struct clk_hw_omap *clk = to_clk_hw_omap(hw);
struct dpll_data *dd;
{
struct clk_hw_omap *clk = to_clk_hw_omap(hw);
struct dpll_data *dd;
@@
-488,10
+488,10
@@
long omap3_noncore_dpll_determine_rate(struct clk_hw *hw, unsigned long rate,
if (__clk_get_rate(dd->clk_bypass) == rate &&
(dd->modes & (1 << DPLL_LOW_POWER_BYPASS))) {
if (__clk_get_rate(dd->clk_bypass) == rate &&
(dd->modes & (1 << DPLL_LOW_POWER_BYPASS))) {
- *best_parent_clk =
dd->clk_bypass
;
+ *best_parent_clk =
__clk_get_hw(dd->clk_bypass)
;
} else {
rate = omap2_dpll_round_rate(hw, rate, best_parent_rate);
} else {
rate = omap2_dpll_round_rate(hw, rate, best_parent_rate);
- *best_parent_clk =
dd->clk_ref
;
+ *best_parent_clk =
__clk_get_hw(dd->clk_ref)
;
}
*best_parent_rate = rate;
}
*best_parent_rate = rate;