diff options
| author | Maxime Ripard <[email protected]> | 2014-11-17 17:02:46 +0100 |
|---|---|---|
| committer | Maxime Ripard <[email protected]> | 2014-11-17 17:02:46 +0100 |
| commit | 407fec5ab79c9e2bc1c224ae9b629decb77d1343 (patch) | |
| tree | fc854390ad68b3dc0779eab8d243c2ddbb351298 | |
| parent | 90795c560d83f5489e64db21f75970d1746b0559 (diff) | |
| parent | 532425a7a7738b479406496ca4ad6b3247688e44 (diff) | |
Merge branch 'sunxi/fixes-for-3.18' into HEAD
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index 3a51151b1dd2..a674b0fc6232 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -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 { |