Skip to contentSkip to conversation

ARM: i.MX6q: fix the wrong parent of can_root clock

PATCH New jiada_wang at mentor.com 3 participants 5 messages Oct 30, 2013 – Nov 26, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: i.MX6q: fix the wrong parent of can_root clock

From: Jiada Wang <[email protected]>

instead of pll3_usb_otg the parent of can_root clock should be pll3_60m.

---
 arch/arm/mach-imx/clk-imx6q.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-imx/clk-imx6q.c +1 -1
index 9181a24..ef85ac4 100644
@@ -428,7 +428,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
 	clk[asrc_podf]        = imx_clk_divider("asrc_podf",        "asrc_pred",         base + 0x30, 9,  3);
 	clk[spdif_pred]       = imx_clk_divider("spdif_pred",       "spdif_sel",         base + 0x30, 25, 3);
 	clk[spdif_podf]       = imx_clk_divider("spdif_podf",       "spdif_pred",        base + 0x30, 22, 3);
-	clk[can_root]         = imx_clk_divider("can_root",         "pll3_usb_otg",      base + 0x20, 2,  6);
+	clk[can_root]         = imx_clk_divider("can_root",         "pll3_60m",          base + 0x20, 2,  6);
 	clk[ecspi_root]       = imx_clk_divider("ecspi_root",       "pll3_60m",          base + 0x38, 19, 6);
 	clk[gpu2d_core_podf]  = imx_clk_divider("gpu2d_core_podf",  "gpu2d_core_sel",    base + 0x18, 23, 3);
 	clk[gpu3d_core_podf]  = imx_clk_divider("gpu3d_core_podf",  "gpu3d_core_sel",    base + 0x18, 26, 3);
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/1 ARM: i.MX6q: fix the wrong parent of can_root clock

Quoted 9 lines · Shawn Guo
Quoted 6 lines · jiada_wang at mentor.com

From: Jiada Wang <[email protected]>

instead of pll3_usb_otg the parent of can_root clock should be pll3_60m.

Applied, thanks.

Can you put stable on Cc?

Marc

Signature · 12 lines
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 259 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131125/ff7cd857/attachment.sig>
#3 lore raw

PATCH 1/1 ARM: i.MX6q: fix the wrong parent of can_root clock

Quoted 4 lines · Marc Kleine-Budde
Quoted 3 lines · Shawn Guo
Quoted 2 lines · jiada_wang at mentor.com

From: Jiada Wang <[email protected]>

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

instead of pll3_usb_otg the parent of can_root clock should be pll3_60m.

Applied, thanks.

Can you put stable on Cc?

Sorry, it already hits mainline.

I generally do not judge if a patch is suitable for stable tree, and rely on patch sender to explicitly request by marking stable and the prerequisite commits if any.

Shawn

#4 lore raw

PATCH 1/1 ARM: i.MX6q: fix the wrong parent of can_root clock

Quoted 8 lines · Shawn Guo
Quoted 7 lines · Marc Kleine-Budde
Quoted 6 lines · Shawn Guo
Quoted 5 lines · jiada_wang at mentor.com

From: Jiada Wang <[email protected]>

instead of pll3_usb_otg the parent of can_root clock should be pll3_60m.

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line

Applied, thanks.

Can you put stable on Cc?

Sorry, it already hits mainline.

No problem, I'll write stable and Greg directly.

Quoted 3 lines

I generally do not judge if a patch is suitable for stable tree, and rely on patch sender to explicitly request by marking stable and the prerequisite commits if any.

Together with the Flexcan clock (can: flexcan: use correct clock as base for bit rate calculation) this fixes the CAN on imx6.

Marc

Signature · 12 lines
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 259 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131126/5ba0f0f8/attachment.sig>