]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
ARM: dts: sun6i: Re-parent ahb1_mux to pll6 as required by dma controller
authorChen-Yu Tsai <wens@csie.org>
Thu, 6 Nov 2014 11:56:49 +0000 (19:56 +0800)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Sat, 8 Nov 2014 14:56:36 +0000 (15:56 +0100)
commit532425a7a7738b479406496ca4ad6b3247688e44
tree2b80e4c90a6c112237174cbe1388dea873b909a7
parentf114040e3ea6e07372334ade75d1ee0775c355e1
ARM: dts: sun6i: Re-parent ahb1_mux to pll6 as required by dma controller

The dma controller requires that the ahb1 bus clock be driven by pll6
for peripheral access to work. Previously this was done in the dma
controller driver, but was since removed as part of a series to unify
the ahb1_mux and ahb1 clock drivers, in

    14e0e28 dmaengine: sun6i: Remove obsolete clk muxing code

Unfortunately the rest of that series did not make it, leaving us with
broken dma on sun6i.

This patch reparents ahb1_mux to pll6 using the DT assigned-clocks
properties in the dma controller node.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
arch/arm/boot/dts/sun6i-a31.dtsi