ARM: dts: rmobile: Extract USB nodes on M3N

The USB nodes are not in Linux 4.17 DTs in M3N, pull them into U-Boot
specific DT extras until they hit mainline Linux, to make syncing of
DTs easier.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
V2: Rebase on u-boot/master

diff --git a/arch/arm/dts/r8a77965-u-boot.dtsi b/arch/arm/dts/r8a77965-u-boot.dtsi
index ca80ef8..15d9467 100644 (file)
--- a/arch/arm/dts/r8a77965-u-boot.dtsi
+++ b/arch/arm/dts/r8a77965-u-boot.dtsi
@@ -19,4 +19,59 @@
                bank-width = <2>;
                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>;
+       };
+
+       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>;
+       };
+
+       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>;
+       };
+
+       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>;
+       };
+
+       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>;
+       };
 };

diff --git a/arch/arm/dts/r8a77965.dtsi b/arch/arm/dts/r8a77965.dtsi
index 840512e..a47f079 100644 (file)
--- a/arch/arm/dts/r8a77965.dtsi
+++ b/arch/arm/dts/r8a77965.dtsi
@@ -645,28 +645,18 @@
                };
 
                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>;
-                       status = "disabled";
+                       /* placeholder */
                };
 
                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>;
-                       status = "disabled";
+                       /* placeholder */
+               };
+
+               usb2_phy1: usb-phy@ee0a0200 {
+                       reg = <0 0xee0a0200 0 0x700>;
+                       /* placeholder */
                };
 
                ohci1: usb@ee0a0000 {
@@ -675,16 +665,8 @@
                };
 
                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>;
-                       status = "disabled";
+                       /* placeholder */
                };
 
                i2c0: i2c@e6500000 {
@@ -852,17 +834,6 @@
                        };
                };
 
-               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>;
-                       status = "disabled";
-               };
-
                sdhi0: sd@ee100000 {
                        compatible = "renesas,sdhi-r8a77965";
                        reg = <0 0xee100000 0 0x2000>;
@@ -919,14 +890,8 @@
                };
 
                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>;
-                       status = "disabled";
+                       /* placeholder */
                };
 
                wdt0: watchdog@e6020000 {