summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJonathan Austin <jonathan.austin@arm.com>2013-07-23 16:42:18 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-13 12:05:33 +0900
commit165b4f8bf37ba929924e9099bd9a1ee5031cf4e7 (patch)
treea7dacd59ded02c89fcf0b0b918e11321ac27ee6c /drivers
parenta33ed3974e7b75af36553589e7810da9d8b22382 (diff)
downloadlinux-3.10-165b4f8bf37ba929924e9099bd9a1ee5031cf4e7.tar.gz
linux-3.10-165b4f8bf37ba929924e9099bd9a1ee5031cf4e7.tar.bz2
linux-3.10-165b4f8bf37ba929924e9099bd9a1ee5031cf4e7.zip
clk: fixup argument order when setting VCO parameters
commit 2f9f64bc5aa31836810cd25301aa4772ad73ebab upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-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 67ccf4aa727..f5e4c21b301 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;
}