renesas: Fix RPC-IF compatible values

The compatible values used for device nodes representing Renesas Reduced
Pin Count Interfaces were based on preliminary versions of the Device
Tree Bindings.

Correct them in both DTSi files and drivers, to match the final DT
Bindings.

Note that there are no DT bindings for RPC-IF on RZ/A1 yet, hence the
most logical SoC-specific value is used, without specifying a
family-specific value.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/arch/arm/dts/r7s72100-gr-peach-u-boot.dts b/arch/arm/dts/r7s72100-gr-peach-u-boot.dts
index 3f532ec..5b176a9 100644 (file)
--- a/arch/arm/dts/r7s72100-gr-peach-u-boot.dts
+++ b/arch/arm/dts/r7s72100-gr-peach-u-boot.dts
@@ -47,7 +47,7 @@
 
 
        rpc: spi@ee200000 {
-               compatible = "renesas,rpc-r7s72100", "renesas,rpc";
+               compatible = "renesas,r7s72100-rpc-if";
                reg = <0x3fefa000 0x100>, <0x18000000 0x08000000>;
                bank-width = <2>;
                num-cs = <1>;

diff --git a/arch/arm/dts/r8a774c0-u-boot.dtsi b/arch/arm/dts/r8a774c0-u-boot.dtsi
index f50816a..d296106 100644 (file)
--- a/arch/arm/dts/r8a774c0-u-boot.dtsi
+++ b/arch/arm/dts/r8a774c0-u-boot.dtsi
@@ -11,7 +11,7 @@
 / {
        soc {
                rpc: spi@ee200000 {
-                       compatible = "renesas,rcar-gen3-rpc", "renesas,rpc-r8a774c0";
+                       compatible = "renesas,r8a774c0-rpc-if", "renesas,rcar-gen3-rpc-if";
                        reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
                        clocks = <&cpg CPG_MOD 917>;
                        bank-width = <2>;

diff --git a/arch/arm/dts/r8a77950-u-boot.dtsi b/arch/arm/dts/r8a77950-u-boot.dtsi
index 5e449a3..2306c7b 100644 (file)
--- a/arch/arm/dts/r8a77950-u-boot.dtsi
+++ b/arch/arm/dts/r8a77950-u-boot.dtsi
@@ -14,7 +14,7 @@
 / {
        soc {
                rpc: spi@ee200000 {
-                       compatible = "renesas,rpc-r8a7795", "renesas,rpc";
+                       compatible = "renesas,r8a7795-rpc-if", "renesas,rcar-gen3-rpc-if";
                        reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
                        clocks = <&cpg CPG_MOD 917>;
                        bank-width = <2>;

diff --git a/arch/arm/dts/r8a77960-u-boot.dtsi b/arch/arm/dts/r8a77960-u-boot.dtsi
index 9013c29..f64e5a4 100644 (file)
--- a/arch/arm/dts/r8a77960-u-boot.dtsi
+++ b/arch/arm/dts/r8a77960-u-boot.dtsi
@@ -14,7 +14,7 @@
 / {
        soc {
                rpc: spi@ee200000 {
-                       compatible = "renesas,rpc-r8a7796", "renesas,rpc";
+                       compatible = "renesas,r8a7796-rpc-if", "renesas,rcar-gen3-rpc-if";
                        reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
                        clocks = <&cpg CPG_MOD 917>;
                        bank-width = <2>;

diff --git a/arch/arm/dts/r8a77965-u-boot.dtsi b/arch/arm/dts/r8a77965-u-boot.dtsi
index f3c99ac..c4abcc5 100644 (file)
--- a/arch/arm/dts/r8a77965-u-boot.dtsi
+++ b/arch/arm/dts/r8a77965-u-boot.dtsi
@@ -14,7 +14,7 @@
 / {
        soc {
                rpc: spi@ee200000 {
-                       compatible = "renesas,rpc-r8a77965", "renesas,rpc";
+                       compatible = "renesas,r8a77965-rpc-if", "renesas,rcar-gen3-rpc-if";
                        reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
                        clocks = <&cpg CPG_MOD 917>;
                        bank-width = <2>;

diff --git a/arch/arm/dts/r8a77970-u-boot.dtsi b/arch/arm/dts/r8a77970-u-boot.dtsi
index 904fc48..614caa9 100644 (file)
--- a/arch/arm/dts/r8a77970-u-boot.dtsi
+++ b/arch/arm/dts/r8a77970-u-boot.dtsi
@@ -14,7 +14,7 @@
 / {
        soc {
                rpc: spi@ee200000 {
-                       compatible = "renesas,rpc-r8a77970", "renesas,rpc";
+                       compatible = "renesas,r8a77970-rpc-if", "renesas,rcar-gen3-rpc-if";
                        reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
                        clocks = <&cpg CPG_MOD 917>;
                        bank-width = <2>;

diff --git a/arch/arm/dts/r8a77980-u-boot.dtsi b/arch/arm/dts/r8a77980-u-boot.dtsi
index 34d6fcd..54f01c9 100644 (file)
--- a/arch/arm/dts/r8a77980-u-boot.dtsi
+++ b/arch/arm/dts/r8a77980-u-boot.dtsi
@@ -14,7 +14,7 @@
 / {
        soc {
                rpc: spi@ee200000 {
-                       compatible = "renesas,rpc-r8a77980", "renesas,rpc";
+                       compatible = "renesas,r8a77980-rpc-if", "renesas,rcar-gen3-rpc-if";
                        reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
                        clocks = <&cpg CPG_MOD 917>;
                        bank-width = <2>;

diff --git a/arch/arm/dts/r8a77990-u-boot.dtsi b/arch/arm/dts/r8a77990-u-boot.dtsi
index 8c75f62..50bbbe1 100644 (file)
--- a/arch/arm/dts/r8a77990-u-boot.dtsi
+++ b/arch/arm/dts/r8a77990-u-boot.dtsi
@@ -10,7 +10,7 @@
 / {
        soc {
                rpc: spi@ee200000 {
-                       compatible = "renesas,rpc-r8a77990", "renesas,rpc";
+                       compatible = "renesas,r8a77990-rpc-if", "renesas,rcar-gen3-rpc-if";
                        reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
                        clocks = <&cpg CPG_MOD 917>;
                        bank-width = <2>;

diff --git a/arch/arm/dts/r8a77995-u-boot.dtsi b/arch/arm/dts/r8a77995-u-boot.dtsi
index cd94666..347b59a 100644 (file)
--- a/arch/arm/dts/r8a77995-u-boot.dtsi
+++ b/arch/arm/dts/r8a77995-u-boot.dtsi
@@ -10,7 +10,7 @@
 / {
        soc {
                rpc: spi@ee200000 {
-                       compatible = "renesas,rpc-r8a77995", "renesas,rpc";
+                       compatible = "renesas,r8a77995-rpc-if", "renesas,rcar-gen3-rpc-if";
                        reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
                        clocks = <&cpg CPG_MOD 917>;
                        bank-width = <2>;

diff --git a/arch/arm/dts/r8a779a0-u-boot.dtsi b/arch/arm/dts/r8a779a0-u-boot.dtsi
index 83dbe3f..9f2772a 100644 (file)
--- a/arch/arm/dts/r8a779a0-u-boot.dtsi
+++ b/arch/arm/dts/r8a779a0-u-boot.dtsi
@@ -10,7 +10,7 @@
 / {
        soc {
                rpc: spi@ee200000 {
-                       compatible = "renesas,rpc-r8a779a0", "renesas,rcar-gen3-rpc";
+                       compatible = "renesas,r8a779a0-rpc-if", "renesas,rcar-gen3-rpc-if";
                        reg = <0 0xee200000 0 0x200>, <0 0x08000000 0 0x04000000>;
                        clocks = <&cpg CPG_MOD 629>;
                        bank-width = <2>;

diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index 2c61ce7..aca7a6c 100644 (file)
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -388,7 +388,8 @@ static int rpc_hf_probe(struct udevice *dev)
 }
 
 static const struct udevice_id rpc_hf_ids[] = {
-       { .compatible = "renesas,rpc" },
+       { .compatible = "renesas,r7s72100-rpc-if" },
+       { .compatible = "renesas,rcar-gen3-rpc-if" },
        {}
 };
 

diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index 26b6aa8..cb2b8fb 100644 (file)
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -449,13 +449,8 @@ static const struct dm_spi_ops rpc_spi_ops = {
 };
 
 static const struct udevice_id rpc_spi_ids[] = {
-       { .compatible = "renesas,rpc-r7s72100" },
-       { .compatible = "renesas,rpc-r8a7795" },
-       { .compatible = "renesas,rpc-r8a7796" },
-       { .compatible = "renesas,rpc-r8a77965" },
-       { .compatible = "renesas,rpc-r8a77970" },
-       { .compatible = "renesas,rpc-r8a77995" },
-       { .compatible = "renesas,rcar-gen3-rpc" },
+       { .compatible = "renesas,r7s72100-rpc-if" },
+       { .compatible = "renesas,rcar-gen3-rpc-if" },
        { }
 };