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

login
register
mail settings
Submitter jiada wang
Date Oct. 30, 2013, 11:25 a.m.
Message ID <1383132351-32112-1-git-send-email-jiada_wang@mentor.com>
Download mbox | patch
Permalink /patch/287196/
State New
Headers show

Comments

jiada wang - Oct. 30, 2013, 11:25 a.m.
From: Jiada Wang <jiada_wang@mentor.com>

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

Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
 arch/arm/mach-imx/clk-imx6q.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Shawn Guo - Oct. 31, 2013, 7:38 a.m.
On Wed, Oct 30, 2013 at 04:25:51AM -0700, jiada_wang@mentor.com wrote:
> From: Jiada Wang <jiada_wang@mentor.com>
> 
> instead of pll3_usb_otg the parent of can_root clock
> should be pll3_60m.
> 
> Signed-off-by: Jiada Wang <jiada_wang@mentor.com>

Applied, thanks.
Marc Kleine-Budde - Nov. 25, 2013, 4:44 p.m.
On 10/31/2013 08:38 AM, Shawn Guo wrote:
> On Wed, Oct 30, 2013 at 04:25:51AM -0700, jiada_wang@mentor.com wrote:
>> From: Jiada Wang <jiada_wang@mentor.com>
>>
>> instead of pll3_usb_otg the parent of can_root clock
>> should be pll3_60m.
>>
>> Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
> 
> Applied, thanks.

Can you put stable on Cc?

Marc
Shawn Guo - Nov. 26, 2013, 2:19 a.m.
On Mon, Nov 25, 2013 at 05:44:31PM +0100, Marc Kleine-Budde wrote:
> On 10/31/2013 08:38 AM, Shawn Guo wrote:
> > On Wed, Oct 30, 2013 at 04:25:51AM -0700, jiada_wang@mentor.com wrote:
> >> From: Jiada Wang <jiada_wang@mentor.com>
> >>
> >> instead of pll3_usb_otg the parent of can_root clock
> >> should be pll3_60m.
> >>
> >> Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
> > 
> > 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
Marc Kleine-Budde - Nov. 26, 2013, 8:34 a.m.
On 11/26/2013 03:19 AM, Shawn Guo wrote:
> On Mon, Nov 25, 2013 at 05:44:31PM +0100, Marc Kleine-Budde wrote:
>> On 10/31/2013 08:38 AM, Shawn Guo wrote:
>>> On Wed, Oct 30, 2013 at 04:25:51AM -0700, jiada_wang@mentor.com wrote:
>>>> From: Jiada Wang <jiada_wang@mentor.com>
>>>>
>>>> instead of pll3_usb_otg the parent of can_root clock
>>>> should be pll3_60m.
>>>>
>>>> Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
>>>
>>> Applied, thanks.
>>
>> Can you put stable on Cc?
> 
> Sorry, it already hits mainline.

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

> 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

Patch

diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 9181a24..ef85ac4 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -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);