ARM: dts: aspeed: Drop "fsi-master" compatibles

The "fsi-master" compatible has been used inconsistently on FSI masters.
It doesn't have any real use or meaning, so it's easier to drop it
everywhere than add it where missing. It is also not documented by any
schemas (only .txt bindings).

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-2-e7b695a29fc3@kernel.org
[arj: Drop hunk affecting removed swift platform]
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts
index f42254ba6aeb21d17925c0c27d2d670bd28b3a71..79c6919b3570b77357ba2c3f8c2aca54cac38e7e 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts
@@ -54,7 +54,7 @@
        };
 
        fsi: gpio-fsi {
-               compatible = "aspeed,ast2500-cf-fsi-master", "fsi-master";
+               compatible = "aspeed,ast2500-cf-fsi-master";
                #address-cells = <2>;
                #size-cells = <0>;
 

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts
index 65b2208f5a901132b61128f1204b13518a21f967..9f2ad551255dcd946c69a47d97d4109805ac7a42 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts
@@ -63,7 +63,7 @@
        };
 
        fsi: gpio-fsi {
-               compatible = "fsi-master-gpio", "fsi-master";
+               compatible = "fsi-master-gpio";
                #address-cells = <2>;
                #size-cells = <0>;
 

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-mowgli.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-mowgli.dts
index 31ff19ef87a0b456927c0585f1cb5ff810316289..6c8b966ffccc5195124941a32e0631674e050e03 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-mowgli.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-mowgli.dts
@@ -165,7 +165,7 @@
        };
 
        fsi: gpio-fsi {
-               compatible = "fsi-master-gpio", "fsi-master";
+               compatible = "fsi-master-gpio";
                #address-cells = <2>;
                #size-cells = <0>;
                no-gpio-delays;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts
index 0a67790f5ad0a3c4a213409a4d7d30b8fa582105..ce6d30ddf07cde5175fcc3b12a2412bd342b81c8 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts
@@ -77,7 +77,7 @@
        };
 
        fsi: gpio-fsi {
-               compatible = "aspeed,ast2500-cf-fsi-master", "fsi-master";
+               compatible = "aspeed,ast2500-cf-fsi-master";
                #address-cells = <2>;
                #size-cells = <0>;
 

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts
index 123da82c04d54e1fa25893d850c253f9c3343c9b..a1d3e046d4a224b0cb9fd7188cbe8b2680b24c01 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts
@@ -55,7 +55,7 @@
        };
 
        fsi: gpio-fsi {
-               compatible = "aspeed,ast2400-cf-fsi-master", "fsi-master";
+               compatible = "aspeed,ast2400-cf-fsi-master";
                #address-cells = <2>;
                #size-cells = <0>;
 

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts
index 96b2930017c5e214adb49795cf4b647212a9ca76..a0263d969e51f961faed0b095982868210209b0d 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts
@@ -68,7 +68,7 @@
        };
 
        fsi: gpio-fsi {
-               compatible = "aspeed,ast2500-cf-fsi-master", "fsi-master";
+               compatible = "aspeed,ast2500-cf-fsi-master";
                #address-cells = <2>;
                #size-cells = <0>;
 

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts
index 8b1e82c8cdfed4af658c504b5e67649817ea65c4..89907b628b6552b269ed40294955bd4d82435e07 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts
@@ -173,7 +173,7 @@
        };
 
        fsi: gpio-fsi {
-               compatible = "fsi-master-gpio", "fsi-master";
+               compatible = "fsi-master-gpio";
                #address-cells = <2>;
                #size-cells = <0>;
                no-gpio-delays;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
index 6ac7b0aa6e548da09fae7ba2d1512f1d6fcc2dc8..627c91f178e686d457fd221c53b64219906b2ffb 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
@@ -96,7 +96,7 @@
        };
 
        fsi: gpio-fsi {
-               compatible = "fsi-master-gpio", "fsi-master";
+               compatible = "fsi-master-gpio";
                #address-cells = <2>;
                #size-cells = <0>;
                no-gpio-delays;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
index 8ed715bd53aab2dccc48aa1109925ef1065c8c13..acdb6ae74b2749ce6a07f1c89d915528930f70d9 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
@@ -847,7 +847,7 @@
 
                        fsim0: fsi@1e79b000 {
                                #interrupt-cells = <1>;
-                               compatible = "aspeed,ast2600-fsi-master", "fsi-master";
+                               compatible = "aspeed,ast2600-fsi-master";
                                reg = <0x1e79b000 0x94>;
                                interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
                                pinctrl-names = "default";
@@ -859,7 +859,7 @@
 
                        fsim1: fsi@1e79b100 {
                                #interrupt-cells = <1>;
-                               compatible = "aspeed,ast2600-fsi-master", "fsi-master";
+                               compatible = "aspeed,ast2600-fsi-master";
                                reg = <0x1e79b100 0x94>;
                                interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
                                pinctrl-names = "default";