Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

[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 19daa6a..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";
                };
 
@@ -1495,5 +1495,51 @@
                        power-domains = <&sysc R8A7795_PD_A3VP>;
                        renesas,fcp = <&fcpf2>;
                };
+
+               du: display@feb00000 {
+                       compatible = "renesas,du-r8a7795";
+                       reg = <0 0xfeb00000 0 0x80000>,
+                             <0 0xfeb90000 0 0x14>;
+                       reg-names = "du", "lvds.0";
+                       interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 270 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 724>,
+                                <&cpg CPG_MOD 723>,
+                                <&cpg CPG_MOD 722>,
+                                <&cpg CPG_MOD 721>,
+                                <&cpg CPG_MOD 727>;
+                       clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0";
+                       status = "disabled";
+
+                       vsps = <&vspd0 &vspd1 &vspd2 &vspd3>;
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       du_out_rgb: endpoint {
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                                       du_out_hdmi0: endpoint {
+                                       };
+                               };
+                               port@2 {
+                                       reg = <2>;
+                                       du_out_hdmi1: endpoint {
+                                       };
+                               };
+                               port@3 {
+                                       reg = <3>;
+                                       du_out_lvds0: endpoint {
+                                       };
+                               };
+                       };
+               };
        };
 };