summaryrefslogtreecommitdiffstats
path: root/arch/mips/boot
diff options
context:
space:
mode:
authorPaul Cercueil <paul@crapouillou.net>2018-08-29 23:32:58 +0200
committerVinod Koul <vkoul@kernel.org>2018-09-11 09:29:26 +0200
commitf57879a574ae5a3b598187d6ff9c26b5f6479ce0 (patch)
treedfe5fff7819112f1cd11e73d3c835912f43df53a /arch/mips/boot
parentdmaengine: dma-jz4780: Use dma_set_residue() (diff)
downloadlinux-f57879a574ae5a3b598187d6ff9c26b5f6479ce0.tar.xz
linux-f57879a574ae5a3b598187d6ff9c26b5f6479ce0.zip
MIPS: JZ4780: DTS: Update DMA node to match driver changes
The driver now accepts two memory resources, the first one for the channel-specific registers, the second one for the controller-specific registers. Note that older devicetrees, without this commit, will still work with the jz4780-dma driver. Signed-off-by: Paul Cercueil <paul@crapouillou.net> Tested-by: Mathieu Malaterre <malat@debian.org> Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'arch/mips/boot')
-rw-r--r--arch/mips/boot/dts/ingenic/jz4780.dtsi3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi b/arch/mips/boot/dts/ingenic/jz4780.dtsi
index ce93d57f1b4d..b03cdec56de9 100644
--- a/arch/mips/boot/dts/ingenic/jz4780.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi
@@ -266,7 +266,8 @@
dma: dma@13420000 {
compatible = "ingenic,jz4780-dma";
- reg = <0x13420000 0x10000>;
+ reg = <0x13420000 0x400
+ 0x13421000 0x40>;
#dma-cells = <2>;
interrupt-parent = <&intc>;