ARM: dts: rmobile: Extract RPC node to u-boot specific DT

The RPC DT bindings are still work in progress. Extract the RPC DT node
from the DT to allow easier update and so it can be replaced once the DT
bindings are stable.

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/r8a7795-u-boot.dtsi b/arch/arm/dts/r8a7795-u-boot.dtsi
index 526966a..cc22c57 100644 (file)
--- a/arch/arm/dts/r8a7795-u-boot.dtsi
+++ b/arch/arm/dts/r8a7795-u-boot.dtsi
@@ -10,3 +10,13 @@
 &extalr_clk {
        u-boot,dm-pre-reloc;
 };
+
+&soc {
+       rpc: rpc@0xee200000 {
+               compatible = "renesas,rpc-r8a7795", "renesas,rpc";
+               reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
+               clocks = <&cpg CPG_MOD 917>;
+               bank-width = <2>;
+               status = "disabled";
+       };
+};

diff --git a/arch/arm/dts/r8a7795.dtsi b/arch/arm/dts/r8a7795.dtsi
index af77bfe..e2713ee 100644 (file)
--- a/arch/arm/dts/r8a7795.dtsi
+++ b/arch/arm/dts/r8a7795.dtsi
@@ -1812,14 +1812,6 @@
                        dma-channels = <2>;
                };
 
-               rpc: rpc@0xee200000 {
-                       compatible = "renesas,rpc-r8a7795", "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-r8a7795",
                                     "renesas,rcar-gen3-sdhi";

diff --git a/arch/arm/dts/r8a7796-u-boot.dtsi b/arch/arm/dts/r8a7796-u-boot.dtsi
index 7cc60bc..4655259 100644 (file)
--- a/arch/arm/dts/r8a7796-u-boot.dtsi
+++ b/arch/arm/dts/r8a7796-u-boot.dtsi
@@ -10,3 +10,13 @@
 &extalr_clk {
        u-boot,dm-pre-reloc;
 };
+
+&soc {
+       rpc: rpc@0xee200000 {
+               compatible = "renesas,rpc-r8a7796", "renesas,rpc";
+               reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
+               clocks = <&cpg CPG_MOD 917>;
+               bank-width = <2>;
+               status = "disabled";
+       };
+};

diff --git a/arch/arm/dts/r8a7796.dtsi b/arch/arm/dts/r8a7796.dtsi
index 2b25a1d..903fef7 100644 (file)
--- a/arch/arm/dts/r8a7796.dtsi
+++ b/arch/arm/dts/r8a7796.dtsi
@@ -1588,14 +1588,6 @@
                        status = "disabled";
                };
 
-               rpc: rpc@0xee200000 {
-                       compatible = "renesas,rpc-r8a7796", "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-r8a7796",
                                     "renesas,rcar-gen3-sdhi";

diff --git a/arch/arm/dts/r8a77965-u-boot.dtsi b/arch/arm/dts/r8a77965-u-boot.dtsi
index f002311..ca80ef8 100644 (file)
--- a/arch/arm/dts/r8a77965-u-boot.dtsi
+++ b/arch/arm/dts/r8a77965-u-boot.dtsi
@@ -10,3 +10,13 @@
 &extalr_clk {
        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";
+       };
+};

diff --git a/arch/arm/dts/r8a77965.dtsi b/arch/arm/dts/r8a77965.dtsi
index f28a82c..840512e 100644 (file)
--- a/arch/arm/dts/r8a77965.dtsi
+++ b/arch/arm/dts/r8a77965.dtsi
@@ -863,14 +863,6 @@
                        status = "disabled";
                };
 
-               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>;

diff --git a/arch/arm/dts/r8a77970-eagle-u-boot.dts b/arch/arm/dts/r8a77970-eagle-u-boot.dts
index 7ab71a1..0c716de 100644 (file)
--- a/arch/arm/dts/r8a77970-eagle-u-boot.dts
+++ b/arch/arm/dts/r8a77970-eagle-u-boot.dts
@@ -7,3 +7,28 @@
 
 #include "r8a77970-eagle.dts"
 #include "r8a77970-u-boot.dtsi"
+
+/ {
+       aliases {
+               spi0 = &rpc;
+       };
+};
+
+&rpc {
+       num-cs = <1>;
+       status = "okay";
+       spi-max-frequency = <50000000>;
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       flash0: spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "s25fs512s", "spi-flash", "jedec,spi-nor";
+               spi-max-frequency = <50000000>;
+               spi-tx-bus-width = <1>;
+               spi-rx-bus-width = <1>;
+               reg = <0>;
+               status = "okay";
+       };
+};

diff --git a/arch/arm/dts/r8a77970-eagle.dts b/arch/arm/dts/r8a77970-eagle.dts
index 5dcad63..107ac5d 100644 (file)
--- a/arch/arm/dts/r8a77970-eagle.dts
+++ b/arch/arm/dts/r8a77970-eagle.dts
@@ -17,7 +17,6 @@
        aliases {
                serial0 = &scif0;
                ethernet0 = &avb;
-               spi0 = &rpc;
        };
 
        chosen {
@@ -91,25 +90,6 @@
        };
 };
 
-&rpc {
-       num-cs = <1>;
-       status = "okay";
-       spi-max-frequency = <50000000>;
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       flash0: spi-flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "s25fs512s", "spi-flash", "jedec,spi-nor";
-               spi-max-frequency = <50000000>;
-               spi-tx-bus-width = <1>;
-               spi-rx-bus-width = <1>;
-               reg = <0>;
-               status = "okay";
-       };
-};
-
 &rwdt {
        timeout-sec = <60>;
        status = "okay";

diff --git a/arch/arm/dts/r8a77970-u-boot.dtsi b/arch/arm/dts/r8a77970-u-boot.dtsi
index 8fb7fe9..2903fdb 100644 (file)
--- a/arch/arm/dts/r8a77970-u-boot.dtsi
+++ b/arch/arm/dts/r8a77970-u-boot.dtsi
@@ -10,3 +10,13 @@
 &extalr_clk {
        u-boot,dm-pre-reloc;
 };
+
+&soc {
+       rpc: rpc@0xee200000 {
+               compatible = "renesas,rpc-r8a77970", "renesas,rpc";
+               reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
+               clocks = <&cpg CPG_MOD 917>;
+               bank-width = <2>;
+               status = "disabled";
+       };
+};

diff --git a/arch/arm/dts/r8a77970.dtsi b/arch/arm/dts/r8a77970.dtsi
index 4f9f8ba..9205da2 100644 (file)
--- a/arch/arm/dts/r8a77970.dtsi
+++ b/arch/arm/dts/r8a77970.dtsi
@@ -614,14 +614,6 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                };
-
-               rpc: rpc@0xee200000 {
-                       compatible = "renesas,rpc-r8a77970", "renesas,rpc";
-                       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
-                       clocks = <&cpg CPG_MOD 917>;
-                       bank-width = <2>;
-                       status = "disabled";
-               };
        };
 
        timer {

diff --git a/arch/arm/dts/r8a77990-u-boot.dtsi b/arch/arm/dts/r8a77990-u-boot.dtsi
index 564c258..052caa7 100644 (file)
--- a/arch/arm/dts/r8a77990-u-boot.dtsi
+++ b/arch/arm/dts/r8a77990-u-boot.dtsi
@@ -6,3 +6,13 @@
  */
 
 #include "r8a779x-u-boot.dtsi"
+
+&soc {
+       rpc: rpc@0xee200000 {
+               compatible = "renesas,rpc-r8a77990", "renesas,rpc";
+               reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
+               clocks = <&cpg CPG_MOD 917>;
+               bank-width = <2>;
+               status = "disabled";
+       };
+};

diff --git a/arch/arm/dts/r8a77990.dtsi b/arch/arm/dts/r8a77990.dtsi
index ad20ea1..8762587 100644 (file)
--- a/arch/arm/dts/r8a77990.dtsi
+++ b/arch/arm/dts/r8a77990.dtsi
@@ -331,14 +331,6 @@
                        compatible = "renesas,prr";
                        reg = <0 0xfff00044 0 4>;
                };
-
-               rpc: rpc@0xee200000 {
-                       compatible = "renesas,rpc-r8a77990", "renesas,rpc";
-                       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
-                       clocks = <&cpg CPG_MOD 917>;
-                       bank-width = <2>;
-                       status = "disabled";
-               };
        };
 
        timer {

diff --git a/arch/arm/dts/r8a77995-u-boot.dtsi b/arch/arm/dts/r8a77995-u-boot.dtsi
index e0852c8..1f6efaf 100644 (file)
--- a/arch/arm/dts/r8a77995-u-boot.dtsi
+++ b/arch/arm/dts/r8a77995-u-boot.dtsi
@@ -6,3 +6,13 @@
  */
 
 #include "r8a779x-u-boot.dtsi"
+
+&soc {
+       rpc: rpc@0xee200000 {
+               compatible = "renesas,rpc-r8a77995", "renesas,rpc";
+               reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
+               clocks = <&cpg CPG_MOD 917>;
+               bank-width = <2>;
+               status = "disabled";
+       };
+};

diff --git a/arch/arm/dts/r8a77995.dtsi b/arch/arm/dts/r8a77995.dtsi
index 5ae37c6..d191d8a 100644 (file)
--- a/arch/arm/dts/r8a77995.dtsi
+++ b/arch/arm/dts/r8a77995.dtsi
@@ -780,14 +780,6 @@
                                };
                        };
                };
-
-               rpc: rpc@0xee200000 {
-                       compatible = "renesas,rpc-r8a77995", "renesas,rpc";
-                       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
-                       clocks = <&cpg CPG_MOD 917>;
-                       bank-width = <2>;
-                       status = "disabled";
-               };
        };
 
        timer {