| From c6d14723ba7ecf448b44b42f01ea10be454547dd Mon Sep 17 00:00:00 2001 |
| From: Vladimir Zapolskiy <vz@mleia.com> |
| Date: Mon, 26 Sep 2016 03:03:42 +0300 |
| Subject: [PATCH] clk: imx31: fix rewritten input argument of |
| mx31_clocks_init() |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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) |
| } |
| } |
| |
| -int __init mx31_clocks_init(void) |
| +int __init mx31_clocks_init(unsigned long fref) |
| { |
| - u32 fref = 26000000; /* default */ |
| - |
| _mx31_clocks_init(fref); |
| |
| clk_register_clkdev(clk[gpt_gate], "per", "imx-gpt.0"); |
| -- |
| 2.10.1 |
| |