Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: imx: Add DMAMUX clock for Vybrid vf610 SoC

Signed-off-by: Jingchang Lu <b35083@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

authored by

Jingchang Lu and committed by
Shawn Guo
daaff6e9 9b015e5a

+10 -1
+5
arch/arm/mach-imx/clk-vf610.c
··· 298 298 clk[VF610_CLK_FLEXCAN0] = imx_clk_gate2("flexcan0", "ipg_bus", CCM_CCGR0, CCM_CCGRx_CGn(0)); 299 299 clk[VF610_CLK_FLEXCAN1] = imx_clk_gate2("flexcan1", "ipg_bus", CCM_CCGR9, CCM_CCGRx_CGn(4)); 300 300 301 + clk[VF610_CLK_DMAMUX0] = imx_clk_gate2("dmamux0", "platform_bus", CCM_CCGR0, CCM_CCGRx_CGn(4)); 302 + clk[VF610_CLK_DMAMUX1] = imx_clk_gate2("dmamux1", "platform_bus", CCM_CCGR0, CCM_CCGRx_CGn(5)); 303 + clk[VF610_CLK_DMAMUX2] = imx_clk_gate2("dmamux2", "platform_bus", CCM_CCGR6, CCM_CCGRx_CGn(1)); 304 + clk[VF610_CLK_DMAMUX3] = imx_clk_gate2("dmamux3", "platform_bus", CCM_CCGR6, CCM_CCGRx_CGn(2)); 305 + 301 306 clk_set_parent(clk[VF610_CLK_QSPI0_SEL], clk[VF610_CLK_PLL1_PFD4]); 302 307 clk_set_rate(clk[VF610_CLK_QSPI0_X4_DIV], clk_get_rate(clk[VF610_CLK_QSPI0_SEL]) / 2); 303 308 clk_set_rate(clk[VF610_CLK_QSPI0_X2_DIV], clk_get_rate(clk[VF610_CLK_QSPI0_X4_DIV]) / 2);
+5 -1
include/dt-bindings/clock/vf610-clock.h
··· 160 160 #define VF610_CLK_GPU2D 147 161 161 #define VF610_CLK_ENET0 148 162 162 #define VF610_CLK_ENET1 149 163 - #define VF610_CLK_END 150 163 + #define VF610_CLK_DMAMUX0 150 164 + #define VF610_CLK_DMAMUX1 151 165 + #define VF610_CLK_DMAMUX2 152 166 + #define VF610_CLK_DMAMUX3 153 167 + #define VF610_CLK_END 154 164 168 165 169 #endif /* __DT_BINDINGS_CLOCK_VF610_H */