Skip to content

Commit 4349c42

Browse files
agnersShawn Guo
authored andcommitted
ARM: imx: clk-vf610: fix FlexCAN clock gating
Extend the clock control for FlexCAN with the second gate which enable the clocks in the Clock Divider (CCM_CSCDR2) register too. Signed-off-by: Stefan Agner <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent fd4959d commit 4349c42

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

arch/arm/mach-imx/clk-vf610.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,10 @@ static void __init vf610_clocks_init(struct device_node *ccm_node)
295295

296296
clk[VF610_CLK_ASRC] = imx_clk_gate2("asrc", "ipg_bus", CCM_CCGR4, CCM_CCGRx_CGn(1));
297297

298-
clk[VF610_CLK_FLEXCAN0] = imx_clk_gate2("flexcan0", "ipg_bus", CCM_CCGR0, CCM_CCGRx_CGn(0));
299-
clk[VF610_CLK_FLEXCAN1] = imx_clk_gate2("flexcan1", "ipg_bus", CCM_CCGR9, CCM_CCGRx_CGn(4));
298+
clk[VF610_CLK_FLEXCAN0_EN] = imx_clk_gate("flexcan0_en", "ipg_bus", CCM_CSCDR2, 11);
299+
clk[VF610_CLK_FLEXCAN0] = imx_clk_gate2("flexcan0", "flexcan0_en", CCM_CCGR0, CCM_CCGRx_CGn(0));
300+
clk[VF610_CLK_FLEXCAN1_EN] = imx_clk_gate("flexcan1_en", "ipg_bus", CCM_CSCDR2, 12);
301+
clk[VF610_CLK_FLEXCAN1] = imx_clk_gate2("flexcan1", "flexcan1_en", CCM_CCGR9, CCM_CCGRx_CGn(4));
300302

301303
clk[VF610_CLK_DMAMUX0] = imx_clk_gate2("dmamux0", "platform_bus", CCM_CCGR0, CCM_CCGRx_CGn(4));
302304
clk[VF610_CLK_DMAMUX1] = imx_clk_gate2("dmamux1", "platform_bus", CCM_CCGR0, CCM_CCGRx_CGn(5));

include/dt-bindings/clock/vf610-clock.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@
164164
#define VF610_CLK_DMAMUX1 151
165165
#define VF610_CLK_DMAMUX2 152
166166
#define VF610_CLK_DMAMUX3 153
167-
#define VF610_CLK_END 154
167+
#define VF610_CLK_FLEXCAN0_EN 154
168+
#define VF610_CLK_FLEXCAN1_EN 155
169+
#define VF610_CLK_END 156
168170

169171
#endif /* __DT_BINDINGS_CLOCK_VF610_H */

0 commit comments

Comments
 (0)