ARM: dts: rmobile: Extract SDHI nodes on M3N

The SDHI 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 15d9467ec0f04ca98b8d4b72c99d935313926b4d..cbd29b3aed682bcbfd1b8905e8ce0eb82c998f32 100644 (file)
--- a/arch/arm/dts/r8a77965-u-boot.dtsi
+++ b/arch/arm/dts/r8a77965-u-boot.dtsi
@@ -20,6 +20,50 @@
                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>;

diff --git a/arch/arm/dts/r8a77965.dtsi b/arch/arm/dts/r8a77965.dtsi
index a47f079c0245297fac80cd879f2f1dea74d196bd..84ecb4631f4b36d86ee12cc854b8bcc073893452 100644 (file)
--- a/arch/arm/dts/r8a77965.dtsi
+++ b/arch/arm/dts/r8a77965.dtsi
@@ -835,47 +835,23 @@
                };
 
                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";
+                       /* placeholder */
                };
 
                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";
+                       /* placeholder */
                };
 
                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";
+                       /* placeholder */
                };
 
                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";
+                       /* placeholder */
                };
 
                usb3_phy0: usb-phy@e65ee000 {