Merge tag 'u-boot-rockchip-20200708' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / arch / arm / dts / r8a77965-u-boot.dtsi

diff --git a/arch/arm/dts/r8a77965-u-boot.dtsi b/arch/arm/dts/r8a77965-u-boot.dtsi
index cbd29b3..33ff5b1 100644 (file)
--- a/arch/arm/dts/r8a77965-u-boot.dtsi
+++ b/arch/arm/dts/r8a77965-u-boot.dtsi
@@ -11,111 +11,70 @@
        u-boot,dm-pre-reloc;
 };
 
-&soc {
-       rpc: rpc@0xee200000 {
-               compatible = "renesas,rpc-r8a77965", "renesas,rpc";
-               reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
-               clocks = <&cpg CPG_MOD 917>;
-               bank-width = <2>;
-               status = "disabled";
-       };
-
-       sdhi0: sd@ee100000 {
-               compatible = "renesas,sdhi-r8a77965";
-               reg = <0 0xee100000 0 0x2000>;
-               interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 314>;
-               max-frequency = <200000000>;
-               power-domains = <&sysc 32>;
-               resets = <&cpg 314>;
-               status = "disabled";
-       };
-
-       sdhi1: sd@ee120000 {
-               compatible = "renesas,sdhi-r8a77965";
-               reg = <0 0xee120000 0 0x2000>;
-               interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 313>;
-               max-frequency = <200000000>;
-               power-domains = <&sysc 32>;
-               resets = <&cpg 313>;
-               status = "disabled";
-       };
-
-       sdhi2: sd@ee140000 {
-               compatible = "renesas,sdhi-r8a77965";
-               reg = <0 0xee140000 0 0x2000>;
-               interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 312>;
-               max-frequency = <200000000>;
-               power-domains = <&sysc 32>;
-               resets = <&cpg 312>;
-               status = "disabled";
-       };
-
-       sdhi3: sd@ee160000 {
-               compatible = "renesas,sdhi-r8a77965";
-               reg = <0 0xee160000 0 0x2000>;
-               interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 311>;
-               max-frequency = <200000000>;
-               power-domains = <&sysc 32>;
-               resets = <&cpg 311>;
-               status = "disabled";
-       };
-
-       ehci0: usb@ee080100 {
-               compatible = "generic-ehci";
-               reg = <0 0xee080100 0 0x100>;
-               interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 703>;
-               phys = <&usb2_phy0>;
-               phy-names = "usb";
-               companion= <&ohci0>;
-               power-domains = <&sysc 32>;
-               resets = <&cpg 703>;
+/ {
+       soc {
+               rpc: rpc@0xee200000 {
+                       compatible = "renesas,rpc-r8a77965", "renesas,rpc";
+                       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
+                       clocks = <&cpg CPG_MOD 917>;
+                       bank-width = <2>;
+                       status = "disabled";
+               };
        };
+};
 
-       usb2_phy0: usb-phy@ee080200 {
-               compatible = "renesas,usb2-phy-r8a77965",
-                            "renesas,rcar-gen3-usb2-phy";
-               reg = <0 0xee080200 0 0x700>;
-               interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 703>;
-               power-domains = <&sysc 32>;
-               resets = <&cpg 703>;
-               #phy-cells = <0>;
-       };
+/delete-node/ &ak4613;
+/delete-node/ &audma0;
+/delete-node/ &audma1;
+/delete-node/ &can0;
+/delete-node/ &can1;
+/delete-node/ &canfd;
+/delete-node/ &csi20;
+/delete-node/ &csi40;
+/delete-node/ &du;
+/delete-node/ &fcpf0;
+/delete-node/ &fcpvb0;
+/delete-node/ &fcpvd0;
+/delete-node/ &fcpvd1;
+/delete-node/ &fcpvi0;
+/delete-node/ &hdmi0;
+/delete-node/ &lvds0;
+/delete-node/ &rcar_sound;
+/delete-node/ &sound_card;
+/delete-node/ &vin0;
+/delete-node/ &vin1;
+/delete-node/ &vin2;
+/delete-node/ &vin3;
+/delete-node/ &vin4;
+/delete-node/ &vin5;
+/delete-node/ &vin6;
+/delete-node/ &vin7;
+/delete-node/ &vspb;
+/delete-node/ &vspd0;
+/delete-node/ &vspd1;
+/delete-node/ &vspi0;
 
-       ehci1: usb@ee0a0100 {
-               compatible = "generic-ehci";
-               reg = <0 0xee0a0100 0 0x100>;
-               interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 702>;
-               phys = <&usb2_phy1>;
-               phy-names = "usb";
-               companion= <&ohci1>;
-               power-domains = <&sysc 32>;
-               resets = <&cpg 702>;
-       };
+/ {
+       /delete-node/ cvbs-in;
+       /delete-node/ hdmi-in;
+       /delete-node/ hdmi0-out;
+       /delete-node/ hdmi1-out;
+       /delete-node/ vga-encoder;
+       /delete-node/ vga;
+};
 
-       usb2_phy1: usb-phy@ee0a0200 {
-               compatible = "renesas,usb2-phy-r8a77965",
-                            "renesas,rcar-gen3-usb2-phy";
-               reg = <0 0xee0a0200 0 0x700>;
-               clocks = <&cpg CPG_MOD 702>;
-               power-domains = <&sysc 32>;
-               resets = <&cpg 702>;
-               #phy-cells = <0>;
-       };
+&i2c4 {
+       /delete-node/ video-receiver@70;
+};
 
-       xhci0: usb@ee000000 {
-               compatible = "renesas,xhci-r8a77965",
-                            "renesas,rcar-gen3-xhci";
-               reg = <0 0xee000000 0 0xc00>;
-               interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&cpg CPG_MOD 328>;
-               power-domains = <&sysc 32>;
-               resets = <&cpg 328>;
+/ {
+       soc {
+               /delete-node/ fdp1@fe940000;
+               /delete-node/ fdp1@fe944000;
+               /delete-node/ fdp1@fe948000;
+               /delete-node/ imr-lx4@fe860000;
+               /delete-node/ imr-lx4@fe870000;
+               /delete-node/ imr-lx4@fe880000;
+               /delete-node/ imr-lx4@fe890000;
        };
 };