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 526966ab24debe55894258070ae3df0415333a08..cc22c57ae3199d5bf09e2af90cb87c43105b4124 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 af77bfe4e4d1bbfd8744144fa2346e6e37875f62..e2713eea48e3d613a40cf3c071afc19cf0ec187e 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 7cc60bc54a92a4c5a71f405eb95b59d759d6595f..4655259afe1a92b048c2a63f8f6de91dfe2db7cd 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 2b25a1d146df9b5963885ac4d14f0a5dc4da12b0..903fef7284bfcd433952467f7d19d9fbbc69c2be 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 f0023114d14f9b6ab76f1abe466139244a3cd593..ca80ef8f29ee98265b7f2c4b0565e196c24c9b20 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 f28a82c1d47dc6c51e4cbc6b3f95098b49466ce9..840512ecfaef24b8ccab123b0dba5cd83ca0a674 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 7ab71a1c65ba7425bc61b8f87afb421ae45f993f..0c716deb6fcca9580430eee47fe13813d158f802 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 5dcad634926af93cd0216cd13dcc6c5a98334f1b..107ac5d393bb6ea5b6e94b6a9f16d384eaf38471 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 8fb7fe92dbcd7ac4635d1765edbd4fc9c7966b9c..2903fdb52371bb340d414ef3e28dd489b2ae7839 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 4f9f8ba3c13ac18026cd565456ac57c93a68a085..9205da2acd668a41ff86f2cb6fd9dd79af459f89 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 564c258e9249ed2b792adb5b2a4038f272e736ee..052caa720dc0a602bd98e2d894678cb314e000a1 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 ad20ea14cda4fd428f58080ab167f0c08ba3d3a0..87625870e633d17aed9b141da9824f96cf83d973 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 e0852c8df21db4027c4db1fec488b591432b61dd..1f6efafb8b4519f3bc69060de92cea22b145cef3 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 5ae37c60fdbdf138ec868dc5c9e51f575a13e779..d191d8ad704fdd5b13046a88b01f8a7ffadfabaa 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 {