arm: zynq: Remove ethernet alias for topic-miami

[oweals/u-boot.git] / arch / arm / dts / r8a7795.dtsi

diff --git a/arch/arm/dts/r8a7795.dtsi b/arch/arm/dts/r8a7795.dtsi
index 110d0681c81ca2e296e0d98035ba7724077ba17f..405ae9c7818596d8b35608bb56cca0760d9b2b04 100644 (file)
--- a/arch/arm/dts/r8a7795.dtsi
+++ b/arch/arm/dts/r8a7795.dtsi
@@ -184,7 +184,7 @@
                clock-frequency = <0>;
        };
 
-       soc {
+       soc: soc {
                compatible = "simple-bus";
                interrupt-parent = <&gic>;
 
@@ -394,6 +394,7 @@
                prr: chipid@fff00044 {
                        compatible = "renesas,prr";
                        reg = <0 0xfff00044 0 4>;
+                       u-boot,dm-pre-reloc;
                };
 
                sysc: system-controller@e6180000 {
@@ -402,7 +403,7 @@
                        #power-domain-cells = <1>;
                };
 
-               pfc: pfc@e6060000 {
+               pfc: pin-controller@e6060000 {
                        compatible = "renesas,pfc-r8a7795";
                        reg = <0 0xe6060000 0 0x50c>;
                };
@@ -887,6 +888,8 @@
                        clocks = <&cpg CPG_MOD 926>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                        resets = <&cpg 926>;
+                       dmas = <&dmac0 0x11>, <&dmac0 0x10>;
+                       dma-names = "tx", "rx";
                        status = "disabled";
                };
 
@@ -1122,6 +1125,16 @@
                                      "dvc.0", "dvc.1",
                                      "clk_a", "clk_b", "clk_c", "clk_i";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 1005>,
+                                <&cpg 1006>, <&cpg 1007>,
+                                <&cpg 1008>, <&cpg 1009>,
+                                <&cpg 1010>, <&cpg 1011>,
+                                <&cpg 1012>, <&cpg 1013>,
+                                <&cpg 1014>, <&cpg 1015>;
+                       reset-names = "ssi-all",
+                                     "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                     "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                     "ssi.1", "ssi.0";
                        status = "disabled";
 
                        rcar_sound,dvc {
@@ -1278,16 +1291,6 @@
                        status = "disabled";
                };
 
-               xhci1: usb@ee0400000 {
-                       compatible = "renesas,xhci-r8a7795", "renesas,rcar-gen3-xhci";
-                       reg = <0 0xee040000 0 0xc00>;
-                       interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 327>;
-                       power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
-                       resets = <&cpg 327>;
-                       status = "disabled";
-               };
-
                usb_dmac0: dma-controller@e65a0000 {
                        compatible = "renesas,r8a7795-usb-dmac",
                                     "renesas,usb-dmac";
@@ -1572,14 +1575,6 @@
                        resets = <&cpg 614>;
                };
 
-               fcpf2: fcp@fe952000 {
-                       compatible = "renesas,fcpf";
-                       reg = <0 0xfe952000 0 0x200>;
-                       clocks = <&cpg CPG_MOD 613>;
-                       power-domains = <&sysc R8A7795_PD_A3VP>;
-                       resets = <&cpg 613>;
-               };
-
                vspbd: vsp@fe960000 {
                        compatible = "renesas,vsp2";
                        reg = <0 0xfe960000 0 0x8000>;
@@ -1637,25 +1632,6 @@
                        resets = <&cpg 610>;
                };
 
-               vspi2: vsp@fe9c0000 {
-                       compatible = "renesas,vsp2";
-                       reg = <0 0xfe9c0000 0 0x8000>;
-                       interrupts = <GIC_SPI 446 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 629>;
-                       power-domains = <&sysc R8A7795_PD_A3VP>;
-                       resets = <&cpg 629>;
-
-                       renesas,fcp = <&fcpvi2>;
-               };
-
-               fcpvi2: fcp@fe9cf000 {
-                       compatible = "renesas,fcpv";
-                       reg = <0 0xfe9cf000 0 0x200>;
-                       clocks = <&cpg CPG_MOD 609>;
-                       power-domains = <&sysc R8A7795_PD_A3VP>;
-                       resets = <&cpg 609>;
-               };
-
                vspd0: vsp@fea20000 {
                        compatible = "renesas,vsp2";
                        reg = <0 0xfea20000 0 0x4000>;
@@ -1713,25 +1689,6 @@
                        resets = <&cpg 601>;
                };
 
-               vspd3: vsp@fea38000 {
-                       compatible = "renesas,vsp2";
-                       reg = <0 0xfea38000 0 0x4000>;
-                       interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 620>;
-                       power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
-                       resets = <&cpg 620>;
-
-                       renesas,fcp = <&fcpvd3>;
-               };
-
-               fcpvd3: fcp@fea3f000 {
-                       compatible = "renesas,fcpv";
-                       reg = <0 0xfea3f000 0 0x200>;
-                       clocks = <&cpg CPG_MOD 600>;
-                       power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
-                       resets = <&cpg 600>;
-               };
-
                fdp1@fe940000 {
                        compatible = "renesas,fdp1";
                        reg = <0 0xfe940000 0 0x2400>;
@@ -1752,18 +1709,57 @@
                        renesas,fcp = <&fcpf1>;
                };
 
-               fdp1@fe948000 {
-                       compatible = "renesas,fdp1";
-                       reg = <0 0xfe948000 0 0x2400>;
-                       interrupts = <GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&cpg CPG_MOD 117>;
-                       power-domains = <&sysc R8A7795_PD_A3VP>;
-                       resets = <&cpg 117>;
-                       renesas,fcp = <&fcpf2>;
+               hdmi0: hdmi0@fead0000 {
+                       compatible = "renesas,r8a7795-hdmi", "renesas,rcar-gen3-hdmi";
+                       reg = <0 0xfead0000 0 0x10000>;
+                       interrupts = <GIC_SPI 389 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 729>, <&cpg CPG_CORE R8A7795_CLK_HDMI>;
+                       clock-names = "iahb", "isfr";
+                       power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 729>;
+                       status = "disabled";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               port@0 {
+                                       reg = <0>;
+                                       dw_hdmi0_in: endpoint {
+                                               remote-endpoint = <&du_out_hdmi0>;
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                               };
+                       };
+               };
+
+               hdmi1: hdmi1@feae0000 {
+                       compatible = "renesas,r8a7795-hdmi", "renesas,rcar-gen3-hdmi";
+                       reg = <0 0xfeae0000 0 0x10000>;
+                       interrupts = <GIC_SPI 436 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 728>, <&cpg CPG_CORE R8A7795_CLK_HDMI>;
+                       clock-names = "iahb", "isfr";
+                       power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 728>;
+                       status = "disabled";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               port@0 {
+                                       reg = <0>;
+                                       dw_hdmi1_in: endpoint {
+                                               remote-endpoint = <&du_out_hdmi1>;
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                               };
+                       };
                };
 
                du: display@feb00000 {
-                       compatible = "renesas,du-r8a7795";
                        reg = <0 0xfeb00000 0 0x80000>,
                              <0 0xfeb90000 0 0x14>;
                        reg-names = "du", "lvds.0";
@@ -1779,8 +1775,6 @@
                        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>;
@@ -1793,11 +1787,13 @@
                                port@1 {
                                        reg = <1>;
                                        du_out_hdmi0: endpoint {
+                                               remote-endpoint = <&dw_hdmi0_in>;
                                        };
                                };
                                port@2 {
                                        reg = <2>;
                                        du_out_hdmi1: endpoint {
+                                               remote-endpoint = <&dw_hdmi1_in>;
                                        };
                                };
                                port@3 {