Merge branch 'sunxi/fixes-for-3.18' into HEAD

407fec5a · Maxime Ripard · 90795c56 · 532425a7 · 407fec5a
Commit 407fec5a authored Nov 17, 2014 by Maxime Ripard
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

arch/arm/boot/dts/sun6i-a31.dtsi arch/arm/boot/dts/sun6i-a31.dtsi +4 -0

No files found.
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -353,6 +353,10 @@ dma: dma-controller@01c02000 {
 			clocks = <&ahb1_gates 6>;
 			resets = <&ahb1_rst 6>;
 			#dma-cells = <1>;
+
+			/* DMA controller requires AHB1 clocked from PLL6 */
+			assigned-clocks = <&ahb1_mux>;
+			assigned-clock-parents = <&pll6>;
 		};

 		mmc0: mmc@01c0f000 {