Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...

[cascardo/linux.git] / arch / arm64 / boot / dts / renesas / r8a7795.dtsi

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 5d59e7f..8c15040 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -328,7 +328,8 @@
                };
 
                audma0: dma-controller@ec700000 {
-                       compatible = "renesas,rcar-dmac";
+                       compatible = "renesas,dmac-r8a7795",
+                                    "renesas,rcar-dmac";
                        reg = <0 0xec700000 0 0x10000>;
                        interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH
                                      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
@@ -360,7 +361,8 @@
                };
 
                audma1: dma-controller@ec720000 {
-                       compatible = "renesas,rcar-dmac";
+                       compatible = "renesas,dmac-r8a7795",
+                                    "renesas,rcar-dmac";
                        reg = <0 0xec720000 0 0x10000>;
                        interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH
                                      GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
@@ -1120,7 +1122,6 @@
                        clocks = <&cpg CPG_MOD 312>;
                        max-frequency = <200000000>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
-                       cap-mmc-highspeed;
                        status = "disabled";
                };
 
@@ -1131,7 +1132,6 @@
                        clocks = <&cpg CPG_MOD 311>;
                        max-frequency = <200000000>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
-                       cap-mmc-highspeed;
                        status = "disabled";
                };