ARM: dts: aspeed: Add missing "ibm,spi-fsi" compatibles

The "ibm,spi-fsi" compatible is missing or incorrect in various nodes.
The incorrect cases used the "ibm,fsi2spi" compatible by mistake which
is the parent node of the actual SPI controller nodes.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Acked-by: Eddie James <eajames@linux.ibm.com>
Link: https://patch.msgid.link/20250731-dt-fsi-cleanups-v1-3-e7b695a29fc3@kernel.org
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
index 4d9e2cd11f44ab596b62713ec4a467061056046f..9f144f527f03b9d39cc583d6afdbb37e947b2b71 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
@@ -2808,6 +2808,7 @@
                        #size-cells = <0>;
 
                        cfam4_spi0: spi@0 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -2824,6 +2825,7 @@
                        };
 
                        cfam4_spi1: spi@20 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x20>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -2840,8 +2842,8 @@
                        };
 
                        cfam4_spi2: spi@40 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x40>;
-                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -2857,8 +2859,8 @@
                        };
 
                        cfam4_spi3: spi@60 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x60>;
-                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -3181,6 +3183,7 @@
                        #size-cells = <0>;
 
                        cfam5_spi0: spi@0 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -3197,6 +3200,7 @@
                        };
 
                        cfam5_spi1: spi@20 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x20>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -3213,8 +3217,8 @@
                        };
 
                        cfam5_spi2: spi@40 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x40>;
-                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -3230,8 +3234,8 @@
                        };
 
                        cfam5_spi3: spi@60 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x60>;
-                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -3554,6 +3558,7 @@
                        #size-cells = <0>;
 
                        cfam6_spi0: spi@0 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -3570,6 +3575,7 @@
                        };
 
                        cfam6_spi1: spi@20 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x20>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -3586,8 +3592,8 @@
                        };
 
                        cfam6_spi2: spi@40 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x40>;
-                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -3603,8 +3609,8 @@
                        };
 
                        cfam6_spi3: spi@60 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x60>;
-                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -3927,6 +3933,7 @@
                        #size-cells = <0>;
 
                        cfam7_spi0: spi@0 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -3943,6 +3950,7 @@
                        };
 
                        cfam7_spi1: spi@20 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x20>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -3959,8 +3967,8 @@
                        };
 
                        cfam7_spi2: spi@40 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x40>;
-                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -3976,8 +3984,8 @@
                        };
 
                        cfam7_spi3: spi@60 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x60>;
-                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 

diff --git a/arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi b/arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi
index 07ce3b2bc62a3b91692b6e230a59f7ad5c878837..06fac236773f2c5936e1d29c2559f79a8f9b1c4f 100644 (file)
--- a/arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi
+++ b/arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi
@@ -82,6 +82,7 @@
                        #size-cells = <0>;
 
                        cfam0_spi0: spi@0 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -98,6 +99,7 @@
                        };
 
                        cfam0_spi1: spi@20 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x20>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -114,8 +116,8 @@
                        };
 
                        cfam0_spi2: spi@40 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x40>;
-                               compatible =  "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -131,8 +133,8 @@
                        };
 
                        cfam0_spi3: spi@60 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x60>;
-                               compatible =  "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -249,6 +251,7 @@
                        #size-cells = <0>;
 
                        cfam1_spi0: spi@0 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -265,6 +268,7 @@
                        };
 
                        cfam1_spi1: spi@20 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x20>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -281,8 +285,8 @@
                        };
 
                        cfam1_spi2: spi@40 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x40>;
-                               compatible =  "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -298,8 +302,8 @@
                        };
 
                        cfam1_spi3: spi@60 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x60>;
-                               compatible =  "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 

diff --git a/arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi b/arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi
index 57494c744b5d0d6a2dbc0a46576842322c2ecbb8..9501f66d0030fbad0ac7f9a6114cea68b527d9cf 100644 (file)
--- a/arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi
+++ b/arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi
@@ -733,6 +733,7 @@
                        #size-cells = <0>;
 
                        cfam2_spi0: spi@0 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -749,6 +750,7 @@
                        };
 
                        cfam2_spi1: spi@20 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x20>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -765,8 +767,8 @@
                        };
 
                        cfam2_spi2: spi@40 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x40>;
-                               compatible =  "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -782,8 +784,8 @@
                        };
 
                        cfam2_spi3: spi@60 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x60>;
-                               compatible =  "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -1106,6 +1108,7 @@
                        #size-cells = <0>;
 
                        cfam3_spi0: spi@0 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1122,6 +1125,7 @@
                        };
 
                        cfam3_spi1: spi@20 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x20>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1138,8 +1142,8 @@
                        };
 
                        cfam3_spi2: spi@40 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x40>;
-                               compatible =  "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -1155,8 +1159,8 @@
                        };
 
                        cfam3_spi3: spi@60 {
+                               compatible = "ibm,spi-fsi";
                                reg = <0x60>;
-                               compatible =  "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;