linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH BUGFIX] clk: imx6q: fix typo in CAN clock definition
@ 2016-03-30 12:23 Lothar Waßmann
  2016-04-06 14:52 ` Shawn Guo
  0 siblings, 1 reply; 2+ messages in thread
From: Lothar Waßmann @ 2016-03-30 12:23 UTC (permalink / raw)
  To: Bai Ping, Shawn Guo, Sascha Hauer, Michael Turquette,
	Stephen Boyd, linux-arm-kernel, linux-clk, linux-kernel
  Cc: Lothar Waßmann

commit ee36027427c7 ("clk: imx: Add clock support for imx6qp")
introduced a regression due to a subtle typo in the 'can_root' clock
definition. The effect is that trying to configure the bitrate of the
can interfaces fails with -EDOM or produces a division by zero error
due to the clock_freq of the can serial clock being reported as '0'.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
---
 drivers/clk/imx/clk-imx6q.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index 02e1818..2beb396f 100644
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -394,7 +394,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
 		clk[IMX6QDL_CLK_LDB_DI1_DIV_3_5] = imx_clk_fixed_factor("ldb_di1_div_3_5", "ldb_di1", 2, 7);
 	} else {
 		clk[IMX6QDL_CLK_ECSPI_ROOT] = imx_clk_divider("ecspi_root", "pll3_60m", base + 0x38, 19, 6);
-		clk[IMX6QDL_CLK_CAN_ROOT] = imx_clk_divider("can_root", "pll3_60", base + 0x20, 2, 6);
+		clk[IMX6QDL_CLK_CAN_ROOT] = imx_clk_divider("can_root", "pll3_60m", base + 0x20, 2, 6);
 		clk[IMX6QDL_CLK_IPG_PER] = imx_clk_fixup_divider("ipg_per", "ipg", base + 0x1c, 0, 6, imx_cscmr1_fixup);
 		clk[IMX6QDL_CLK_UART_SERIAL_PODF] = imx_clk_divider("uart_serial_podf", "pll3_80m",          base + 0x24, 0,  6);
 		clk[IMX6QDL_CLK_LDB_DI0_DIV_3_5] = imx_clk_fixed_factor("ldb_di0_div_3_5", "ldb_di0_sel", 2, 7);
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH BUGFIX] clk: imx6q: fix typo in CAN clock definition
  2016-03-30 12:23 [PATCH BUGFIX] clk: imx6q: fix typo in CAN clock definition Lothar Waßmann
@ 2016-04-06 14:52 ` Shawn Guo
  0 siblings, 0 replies; 2+ messages in thread
From: Shawn Guo @ 2016-04-06 14:52 UTC (permalink / raw)
  To: Lothar Waßmann
  Cc: Bai Ping, Sascha Hauer, Michael Turquette, Stephen Boyd,
	linux-arm-kernel, linux-clk, linux-kernel

On Wed, Mar 30, 2016 at 02:23:03PM +0200, Lothar Waßmann wrote:
> commit ee36027427c7 ("clk: imx: Add clock support for imx6qp")
> introduced a regression due to a subtle typo in the 'can_root' clock
> definition. The effect is that trying to configure the bitrate of the
> can interfaces fails with -EDOM or produces a division by zero error
> due to the clock_freq of the can serial clock being reported as '0'.
> 
> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-04-06 14:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-30 12:23 [PATCH BUGFIX] clk: imx6q: fix typo in CAN clock definition Lothar Waßmann
2016-04-06 14:52 ` Shawn Guo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).