evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Maxime Ripard 2014-11-17 17:02:46 +01:00
commit 407fec5ab7
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/boot/dts/sun6i-a31.dtsi
View file

@ -353,6 +353,10 @@
clocks = <&ahb1_gates 6>; clocks = <&ahb1_gates 6>;
resets = <&ahb1_rst 6>; resets = <&ahb1_rst 6>;
#dma-cells = <1>; #dma-cells = <1>;
/* DMA controller requires AHB1 clocked from PLL6 */
assigned-clocks = <&ahb1_mux>;
assigned-clock-parents = <&pll6>;
}; };
mmc0: mmc@01c0f000 { mmc0: mmc@01c0f000 {