1. Patchew
  2. linux
  3. [PATCH 0/6] ASpeed FSI DT clean-ups
  4. View patch

[PATCH 3/6] ARM: dts: aspeed: Add missing "ibm,spi-fsi" compatibles

Rob Herring (Arm) posted 6 patches 2 months ago
[PATCH 3/6] ARM: dts: aspeed: Add missing "ibm,spi-fsi" compatibles
Posted by Rob Herring (Arm) 2 months ago 
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>
---
 .../arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 24 ++++++++++++++--------
 arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi     | 12 +++++++----
 arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi     | 12 +++++++----
 3 files changed, 32 insertions(+), 16 deletions(-)

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 9961508ee872..52a044b1e454 100644
--- 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 @@ fsi2spi@1c00 {
 			#size-cells = <0>;
 
 			cfam4_spi0: spi@0 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x0>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -2824,6 +2825,7 @@ eeprom@0 {
 			};
 
 			cfam4_spi1: spi@20 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x20>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -2840,8 +2842,8 @@ eeprom@0 {
 			};
 
 			cfam4_spi2: spi@40 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x40>;
-				compatible = "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -2857,8 +2859,8 @@ eeprom@0 {
 			};
 
 			cfam4_spi3: spi@60 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x60>;
-				compatible = "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -3181,6 +3183,7 @@ fsi2spi@1c00 {
 			#size-cells = <0>;
 
 			cfam5_spi0: spi@0 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x0>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -3197,6 +3200,7 @@ eeprom@0 {
 			};
 
 			cfam5_spi1: spi@20 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x20>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -3213,8 +3217,8 @@ eeprom@0 {
 			};
 
 			cfam5_spi2: spi@40 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x40>;
-				compatible = "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -3230,8 +3234,8 @@ eeprom@0 {
 			};
 
 			cfam5_spi3: spi@60 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x60>;
-				compatible = "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -3554,6 +3558,7 @@ fsi2spi@1c00 {
 			#size-cells = <0>;
 
 			cfam6_spi0: spi@0 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x0>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -3570,6 +3575,7 @@ eeprom@0 {
 			};
 
 			cfam6_spi1: spi@20 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x20>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -3586,8 +3592,8 @@ eeprom@0 {
 			};
 
 			cfam6_spi2: spi@40 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x40>;
-				compatible = "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -3603,8 +3609,8 @@ eeprom@0 {
 			};
 
 			cfam6_spi3: spi@60 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x60>;
-				compatible = "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -3927,6 +3933,7 @@ fsi2spi@1c00 {
 			#size-cells = <0>;
 
 			cfam7_spi0: spi@0 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x0>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -3943,6 +3950,7 @@ eeprom@0 {
 			};
 
 			cfam7_spi1: spi@20 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x20>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -3959,8 +3967,8 @@ eeprom@0 {
 			};
 
 			cfam7_spi2: spi@40 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x40>;
-				compatible = "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -3976,8 +3984,8 @@ eeprom@0 {
 			};
 
 			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 07ce3b2bc62a..06fac236773f 100644
--- a/arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi
+++ b/arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi
@@ -82,6 +82,7 @@ fsi2spi@1c00 {
 			#size-cells = <0>;
 
 			cfam0_spi0: spi@0 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x0>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -98,6 +99,7 @@ eeprom@0 {
 			};
 
 			cfam0_spi1: spi@20 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x20>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -114,8 +116,8 @@ eeprom@0 {
 			};
 
 			cfam0_spi2: spi@40 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x40>;
-				compatible =  "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -131,8 +133,8 @@ eeprom@0 {
 			};
 
 			cfam0_spi3: spi@60 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x60>;
-				compatible =  "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -249,6 +251,7 @@ fsi2spi@1c00 {
 			#size-cells = <0>;
 
 			cfam1_spi0: spi@0 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x0>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -265,6 +268,7 @@ eeprom@0 {
 			};
 
 			cfam1_spi1: spi@20 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x20>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -281,8 +285,8 @@ eeprom@0 {
 			};
 
 			cfam1_spi2: spi@40 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x40>;
-				compatible =  "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -298,8 +302,8 @@ eeprom@0 {
 			};
 
 			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 57494c744b5d..9501f66d0030 100644
--- a/arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi
+++ b/arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi
@@ -733,6 +733,7 @@ fsi2spi@1c00 {
 			#size-cells = <0>;
 
 			cfam2_spi0: spi@0 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x0>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -749,6 +750,7 @@ eeprom@0 {
 			};
 
 			cfam2_spi1: spi@20 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x20>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -765,8 +767,8 @@ eeprom@0 {
 			};
 
 			cfam2_spi2: spi@40 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x40>;
-				compatible =  "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -782,8 +784,8 @@ eeprom@0 {
 			};
 
 			cfam2_spi3: spi@60 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x60>;
-				compatible =  "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -1106,6 +1108,7 @@ fsi2spi@1c00 {
 			#size-cells = <0>;
 
 			cfam3_spi0: spi@0 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x0>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1122,6 +1125,7 @@ eeprom@0 {
 			};
 
 			cfam3_spi1: spi@20 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x20>;
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -1138,8 +1142,8 @@ eeprom@0 {
 			};
 
 			cfam3_spi2: spi@40 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x40>;
-				compatible =  "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -1155,8 +1159,8 @@ eeprom@0 {
 			};
 
 			cfam3_spi3: spi@60 {
+				compatible = "ibm,spi-fsi";
 				reg = <0x60>;
-				compatible =  "ibm,fsi2spi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 

-- 
2.47.2
Re: [PATCH 3/6] ARM: dts: aspeed: Add missing "ibm,spi-fsi" compatibles
Posted by Eddie James 2 months ago 
On 7/31/25 17:12, Rob Herring (Arm) wrote:
> 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.


Acked-by: Eddie James <eajames@linux.ibm.com>


>
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> ---
>   .../arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 24 ++++++++++++++--------
>   arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi     | 12 +++++++----
>   arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi     | 12 +++++++----
>   3 files changed, 32 insertions(+), 16 deletions(-)
>
> 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 9961508ee872..52a044b1e454 100644
> --- 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 @@ fsi2spi@1c00 {
>   			#size-cells = <0>;
>   
>   			cfam4_spi0: spi@0 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x0>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -2824,6 +2825,7 @@ eeprom@0 {
>   			};
>   
>   			cfam4_spi1: spi@20 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x20>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -2840,8 +2842,8 @@ eeprom@0 {
>   			};
>   
>   			cfam4_spi2: spi@40 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x40>;
> -				compatible = "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
> @@ -2857,8 +2859,8 @@ eeprom@0 {
>   			};
>   
>   			cfam4_spi3: spi@60 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x60>;
> -				compatible = "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
> @@ -3181,6 +3183,7 @@ fsi2spi@1c00 {
>   			#size-cells = <0>;
>   
>   			cfam5_spi0: spi@0 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x0>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -3197,6 +3200,7 @@ eeprom@0 {
>   			};
>   
>   			cfam5_spi1: spi@20 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x20>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -3213,8 +3217,8 @@ eeprom@0 {
>   			};
>   
>   			cfam5_spi2: spi@40 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x40>;
> -				compatible = "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
> @@ -3230,8 +3234,8 @@ eeprom@0 {
>   			};
>   
>   			cfam5_spi3: spi@60 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x60>;
> -				compatible = "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
> @@ -3554,6 +3558,7 @@ fsi2spi@1c00 {
>   			#size-cells = <0>;
>   
>   			cfam6_spi0: spi@0 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x0>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -3570,6 +3575,7 @@ eeprom@0 {
>   			};
>   
>   			cfam6_spi1: spi@20 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x20>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -3586,8 +3592,8 @@ eeprom@0 {
>   			};
>   
>   			cfam6_spi2: spi@40 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x40>;
> -				compatible = "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
> @@ -3603,8 +3609,8 @@ eeprom@0 {
>   			};
>   
>   			cfam6_spi3: spi@60 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x60>;
> -				compatible = "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
> @@ -3927,6 +3933,7 @@ fsi2spi@1c00 {
>   			#size-cells = <0>;
>   
>   			cfam7_spi0: spi@0 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x0>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -3943,6 +3950,7 @@ eeprom@0 {
>   			};
>   
>   			cfam7_spi1: spi@20 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x20>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -3959,8 +3967,8 @@ eeprom@0 {
>   			};
>   
>   			cfam7_spi2: spi@40 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x40>;
> -				compatible = "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
> @@ -3976,8 +3984,8 @@ eeprom@0 {
>   			};
>   
>   			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 07ce3b2bc62a..06fac236773f 100644
> --- a/arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi
> +++ b/arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi
> @@ -82,6 +82,7 @@ fsi2spi@1c00 {
>   			#size-cells = <0>;
>   
>   			cfam0_spi0: spi@0 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x0>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -98,6 +99,7 @@ eeprom@0 {
>   			};
>   
>   			cfam0_spi1: spi@20 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x20>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -114,8 +116,8 @@ eeprom@0 {
>   			};
>   
>   			cfam0_spi2: spi@40 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x40>;
> -				compatible =  "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
> @@ -131,8 +133,8 @@ eeprom@0 {
>   			};
>   
>   			cfam0_spi3: spi@60 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x60>;
> -				compatible =  "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
> @@ -249,6 +251,7 @@ fsi2spi@1c00 {
>   			#size-cells = <0>;
>   
>   			cfam1_spi0: spi@0 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x0>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -265,6 +268,7 @@ eeprom@0 {
>   			};
>   
>   			cfam1_spi1: spi@20 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x20>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -281,8 +285,8 @@ eeprom@0 {
>   			};
>   
>   			cfam1_spi2: spi@40 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x40>;
> -				compatible =  "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
> @@ -298,8 +302,8 @@ eeprom@0 {
>   			};
>   
>   			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 57494c744b5d..9501f66d0030 100644
> --- a/arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi
> +++ b/arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi
> @@ -733,6 +733,7 @@ fsi2spi@1c00 {
>   			#size-cells = <0>;
>   
>   			cfam2_spi0: spi@0 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x0>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -749,6 +750,7 @@ eeprom@0 {
>   			};
>   
>   			cfam2_spi1: spi@20 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x20>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -765,8 +767,8 @@ eeprom@0 {
>   			};
>   
>   			cfam2_spi2: spi@40 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x40>;
> -				compatible =  "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
> @@ -782,8 +784,8 @@ eeprom@0 {
>   			};
>   
>   			cfam2_spi3: spi@60 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x60>;
> -				compatible =  "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
> @@ -1106,6 +1108,7 @@ fsi2spi@1c00 {
>   			#size-cells = <0>;
>   
>   			cfam3_spi0: spi@0 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x0>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -1122,6 +1125,7 @@ eeprom@0 {
>   			};
>   
>   			cfam3_spi1: spi@20 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x20>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> @@ -1138,8 +1142,8 @@ eeprom@0 {
>   			};
>   
>   			cfam3_spi2: spi@40 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x40>;
> -				compatible =  "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
> @@ -1155,8 +1159,8 @@ eeprom@0 {
>   			};
>   
>   			cfam3_spi3: spi@60 {
> +				compatible = "ibm,spi-fsi";
>   				reg = <0x60>;
> -				compatible =  "ibm,fsi2spi";
>   				#address-cells = <1>;
>   				#size-cells = <0>;
>   
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.