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

This commit is contained in:
Maxime Ripard 2014-11-17 17:02:46 +01:00
commit 407fec5ab7

View file

@ -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 {