diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 14:16:16 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 14:16:16 +0100 |
| commit | 4e2594c4df50d7b8d9fd3defcf81082ef3b45638 (patch) | |
| tree | 13fafb57a8b8b21f7cad245ddb0a90469bec81cc /arch/arm | |
| parent | Linux 3.18-rc5 (diff) | |
| parent | ARM: dts: sun6i: Re-parent ahb1_mux to pll6 as required by dma controller (diff) | |
| download | linux-4e2594c4df50d7b8d9fd3defcf81082ef3b45638.tar.xz linux-4e2594c4df50d7b8d9fd3defcf81082ef3b45638.zip | |
Merge tag 'sunxi-fixes-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes
Merge "Allwinner fixes for 3.18" from Maxime Ripard:
A fix for the A31 dma controller that requires the AHB clock to be parented to
PLL6 in order to operate.
* tag 'sunxi-fixes-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: dts: sun6i: Re-parent ahb1_mux to pll6 as required by dma controller
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -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 543f895d18d3..2e652e2339e9 100644 --- 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 { |