aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vz@mleia.com>2016-09-25 20:03:42 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-12 05:39:27 -0500
commit5dd700e897e4d1f74fde0826ed2ed7db08c47327 (patch)
tree4ff0505f080eea532821c23faa05082f921a550a
parent6c9f628468723e85fa59651e258bd462091692ad (diff)
clk: imx31: fix rewritten input argument of mx31_clocks_init()
commit bae203d58b7dce89664071b3fafe20cedaa3e4f6 upstream. Function mx31_clocks_init() is called during clock intialization on legacy boards with reference clock frequency passed as its input argument, this can be verified by examination of the function declaration found in arch/arm/mach-imx/common.h and actual function users which include that header file. Inside CCF driver the function ignores its input argument, by chance the used value in the function body is the same as input arguments on side of all callers. Fixes: d9388c843237 ("clk: imx31: Do not call mxc_timer_init twice when booting with DT") Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/clk/imx/clk-imx31.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/imx/clk-imx31.c b/drivers/clk/imx/clk-imx31.c
index 6a964144a5b5..6a49ba2b9671 100644
--- a/drivers/clk/imx/clk-imx31.c
+++ b/drivers/clk/imx/clk-imx31.c
@@ -157,10 +157,8 @@ static void __init _mx31_clocks_init(unsigned long fref)
157 } 157 }
158} 158}
159 159
160int __init mx31_clocks_init(void) 160int __init mx31_clocks_init(unsigned long fref)
161{ 161{
162 u32 fref = 26000000; /* default */
163
164 _mx31_clocks_init(fref); 162 _mx31_clocks_init(fref);
165 163
166 clk_register_clkdev(clk[gpt_gate], "per", "imx-gpt.0"); 164 clk_register_clkdev(clk[gpt_gate], "per", "imx-gpt.0");