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

Commit 407fec5a authored by Maxime Ripard's avatar Maxime Ripard
Browse files

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

parents 90795c56 532425a7

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

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