projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 3.18-rc7 into staging-work.
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
sun6i-a31.dtsi
diff --git
a/arch/arm/boot/dts/sun6i-a31.dtsi
b/arch/arm/boot/dts/sun6i-a31.dtsi
index
543f895
..
2e652e2
100644
(file)
--- a/
arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/
arch/arm/boot/dts/sun6i-a31.dtsi
@@
-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 {