Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e2594c4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-fixes-for-3.18' of... 

Merge tag 'sunxi-fixes-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes

Merge "Allwinner fixes for 3.18" from Maxime Ripard:

A fix for the A31 dma controller that requires the AHB clock to be parented to
PLL6 in order to operate.

* tag 'sunxi-fixes-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux

:
  ARM: dts: sun6i: Re-parent ahb1_mux to pll6 as required by dma controller

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fc14f9c1 532425a7

arch/arm/boot/dts/sun6i-a31.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -361,6 +361,10 @@ 
			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 {