summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorJonathan Austin <jonathan.austin@arm.com>2013-07-23 16:42:18 +0100
committerMike Turquette <mturquette@linaro.org>2013-10-07 23:01:07 -0700
commit2f9f64bc5aa31836810cd25301aa4772ad73ebab (patch)
tree9ea2482804a3a5705023615e8e012c500d2f7141 /drivers/clk
parent79a2e998895ae3e75d6d3d9fdeec2be94bfcf6c8 (diff)
downloadlinux-stable-2f9f64bc5aa31836810cd25301aa4772ad73ebab.tar.gz
linux-stable-2f9f64bc5aa31836810cd25301aa4772ad73ebab.tar.bz2
linux-stable-2f9f64bc5aa31836810cd25301aa4772ad73ebab.zip
clk: fixup argument order when setting VCO parameters
The order of arguments in the call to vco_set() for the ICST clocks appears to have been switched in error, which results in the VCO not being initialised correctly. This in turn stops the integrated LCD on things like Integrator/CP from working correctly. This patch fixes the order and restores the expected functionality. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Jonathan Austin <jonathan.austin@arm.com> Signed-off-by: Mike Turquette <mturquette@linaro.org> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/versatile/clk-icst.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/versatile/clk-icst.c b/drivers/clk/versatile/clk-icst.c
index 67ccf4aa7277..f5e4c21b301f 100644
--- a/drivers/clk/versatile/clk-icst.c
+++ b/drivers/clk/versatile/clk-icst.c
@@ -107,7 +107,7 @@ static int icst_set_rate(struct clk_hw *hw, unsigned long rate,
vco = icst_hz_to_vco(icst->params, rate);
icst->rate = icst_hz(icst->params, vco);
- vco_set(icst->vcoreg, icst->lockreg, vco);
+ vco_set(icst->lockreg, icst->vcoreg, vco);
return 0;
}