53 files changed, 2108 insertions, 967 deletions

diff --git a/Documentation/devicetree/bindings/dma/jz4780-dma.txt b/Documentation/devicetree/bindings/dma/jz4780-dma.txt
index 03e9cf7b42e0..636fcb26b164 100644
--- a/Documentation/devicetree/bindings/dma/jz4780-dma.txt
+++ b/Documentation/devicetree/bindings/dma/jz4780-dma.txt
@@ -2,8 +2,13 @@
 
 Required properties:
 
-- compatible: Should be "ingenic,jz4780-dma"
-- reg: Should contain the DMA controller registers location and length.
+- compatible: Should be one of:
+  * ingenic,jz4740-dma
+  * ingenic,jz4725b-dma
+  * ingenic,jz4770-dma
+  * ingenic,jz4780-dma
+- reg: Should contain the DMA channel registers location and length, followed
+  by the DMA controller registers location and length.
 - interrupts: Should contain the interrupt specifier of the DMA controller.
 - clocks: Should contain a clock specifier for the JZ4780 PDMA clock.
 - #dma-cells: Must be <2>. Number of integer cells in the dmas property of
@@ -19,9 +24,10 @@ Optional properties:
 
 Example:
 
-dma: dma@13420000 {
+dma: dma-controller@13420000 {
         compatible = "ingenic,jz4780-dma";
-        reg = <0x13420000 0x10000>;
+        reg = <0x13420000 0x400
+               0x13421000 0x40>;
 
         interrupt-parent = <&intc>;
         interrupts = <10>;
diff --git a/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt b/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
index 946229c48657..a5a7c3f5a1e3 100644
--- a/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
+++ b/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
@@ -17,6 +17,7 @@ Required Properties:
 - compatible: "renesas,dmac-<soctype>", "renesas,rcar-dmac" as fallback.
               Examples with soctypes are:
                 - "renesas,dmac-r8a7743" (RZ/G1M)
+                - "renesas,dmac-r8a7744" (RZ/G1N)
                 - "renesas,dmac-r8a7745" (RZ/G1E)
                 - "renesas,dmac-r8a77470" (RZ/G1C)
                 - "renesas,dmac-r8a7790" (R-Car H2)
diff --git a/Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt b/Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt
index 482e54362d3e..1743017bd948 100644
--- a/Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt
+++ b/Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt
@@ -4,6 +4,7 @@ Required Properties:
 -compatible: "renesas,<soctype>-usb-dmac", "renesas,usb-dmac" as fallback.
         Examples with soctypes are:
           - "renesas,r8a7743-usb-dmac" (RZ/G1M)
+          - "renesas,r8a7744-usb-dmac" (RZ/G1N)
           - "renesas,r8a7745-usb-dmac" (RZ/G1E)
           - "renesas,r8a7790-usb-dmac" (R-Car H2)
           - "renesas,r8a7791-usb-dmac" (R-Car M2-W)
diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi b/arch/mips/boot/dts/ingenic/jz4740.dtsi
index 26c6b561d6f7..6fb16fd24035 100644
--- a/arch/mips/boot/dts/ingenic/jz4740.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4740.dtsi
@@ -154,6 +154,21 @@
                 clock-names = "baud", "module";
         };
 
+        dmac: dma-controller@13020000 {
+                compatible = "ingenic,jz4740-dma";
+                reg = <0x13020000 0xbc
+                       0x13020300 0x14>;
+                #dma-cells = <2>;
+
+                interrupt-parent = <&intc>;
+                interrupts = <29>;
+
+                clocks = <&cgu JZ4740_CLK_DMA>;
+
+                /* Disable dmac until we have something that uses it */
+                status = "disabled";
+        };
+
         uhc: uhc@13030000 {
                 compatible = "ingenic,jz4740-ohci", "generic-ohci";
                 reg = <0x13030000 0x1000>;
diff --git a/arch/mips/boot/dts/ingenic/jz4770.dtsi b/arch/mips/boot/dts/ingenic/jz4770.dtsi
index 7c2804f3f5f1..49ede6c14ff3 100644
--- a/arch/mips/boot/dts/ingenic/jz4770.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4770.dtsi
@@ -196,6 +196,36 @@
                 status = "disabled";
         };
 
+        dmac0: dma-controller@13420000 {
+                compatible = "ingenic,jz4770-dma";
+                reg = <0x13420000 0xC0
+                       0x13420300 0x20>;
+
+                #dma-cells = <1>;
+
+                clocks = <&cgu JZ4770_CLK_DMA>;
+                interrupt-parent = <&intc>;
+                interrupts = <24>;
+
+                /* Disable dmac0 until we have something that uses it */
+                status = "disabled";
+        };
+
+        dmac1: dma-controller@13420100 {
+                compatible = "ingenic,jz4770-dma";
+                reg = <0x13420100 0xC0
+                       0x13420400 0x20>;
+
+                #dma-cells = <1>;
+
+                clocks = <&cgu JZ4770_CLK_DMA>;
+                interrupt-parent = <&intc>;
+                interrupts = <23>;
+