evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "clk: msm: Fix half-divider calculation for slave clks"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-21 15:48:41 -08:00 • committed by Gerrit - the friendly Code Review server
commit c834e8d43d
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/clk/msm/clock-generic.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -491,6 +491,9 @@ static long __slave_div_round_rate(struct clk *c, unsigned long rate,
if (best_div) if (best_div)
*best_div = div; *best_div = div;
if (d->data.is_half_divider)
p_rate *= 2;
return p_rate / div; return p_rate / div;
} }
@ -530,9 +533,16 @@ static int slave_div_set_rate(struct clk *c, unsigned long rate)
static unsigned long slave_div_get_rate(struct clk *c) static unsigned long slave_div_get_rate(struct clk *c)
{ {
struct div_clk *d = to_div_clk(c); struct div_clk *d = to_div_clk(c);
unsigned long rate;
if (!d->data.div) if (!d->data.div)
return 0; return 0;
return clk_get_rate(c->parent) / d->data.div;
rate = clk_get_rate(c->parent) / d->data.div;
if (d->data.is_half_divider)
rate *= 2;
return rate;
} }
struct clk_ops clk_ops_slave_div = { struct clk_ops clk_ops_slave_div = {