| Message ID | 20250731-dt-fsi-cleanups-v1-2-e7b695a29fc3@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | ASpeed FSI DT clean-ups | expand |
On 7/31/25 17:12, Rob Herring (Arm) wrote: > 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). Acked-by: Eddie James <eajames@linux.ibm.com> > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> > --- > arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts | 2 +- > arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts | 2 +- > arch/arm/boot/dts/aspeed/aspeed-bmc-opp-mowgli.dts | 2 +- > arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts | 2 +- > arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts | 2 +- > arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts | 2 +- > arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts | 2 +- > arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts | 2 +- > arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts | 2 +- > arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 4 ++-- > 10 files changed, 11 insertions(+), 11 deletions(-) > > 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 f42254ba6aeb..79c6919b3570 100644 > --- 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 @@ video_engine_memory: jpegbuffer { > }; > > 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 370738572a55..87acbfc0a1b7 100644 > --- 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 @@ sys_err { > }; > > 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 31ff19ef87a0..6c8b966ffccc 100644 > --- 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 @@ fan4 { > }; > > 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 e5b8d07e7622..1b7c25e307bc 100644 > --- 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 @@ attention { > }; > > 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 45631b47a7b3..c7aa14034dc0 100644 > --- 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 @@ identify { > }; > > 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 2180fa9b6f24..3c03204869e7 100644 > --- 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 @@ power { > }; > > 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-swift.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts > index a0e8c97e944a..39d0fe46fd9e 100644 > --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts > +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts > @@ -200,7 +200,7 @@ rear-id { > }; > > 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-witherspoon.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts > index 8b1e82c8cdfe..89907b628b65 100644 > --- 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 @@ power-button { > }; > > 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 9904f0a58cfa..9b49b0aa8b35 100644 > --- 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 @@ hdd_fault { > }; > > 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 8ed715bd53aa..acdb6ae74b27 100644 > --- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi > +++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi > @@ -847,7 +847,7 @@ i2c: bus@1e78a000 { > > 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 @@ fsim0: fsi@1e79b000 { > > 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"; >
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 f42254ba6aeb..79c6919b3570 100644 --- 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 @@ video_engine_memory: jpegbuffer { }; 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 370738572a55..87acbfc0a1b7 100644 --- 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 @@ sys_err { }; 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 31ff19ef87a0..6c8b966ffccc 100644 --- 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 @@ fan4 { }; 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 e5b8d07e7622..1b7c25e307bc 100644 --- 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 @@ attention { }; 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 45631b47a7b3..c7aa14034dc0 100644 --- 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 @@ identify { }; 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 2180fa9b6f24..3c03204869e7 100644 --- 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 @@ power { }; 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-swift.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts index a0e8c97e944a..39d0fe46fd9e 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts @@ -200,7 +200,7 @@ rear-id { }; 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-witherspoon.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts index 8b1e82c8cdfe..89907b628b65 100644 --- 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 @@ power-button { }; 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 9904f0a58cfa..9b49b0aa8b35 100644 --- 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 @@ hdd_fault { }; 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 8ed715bd53aa..acdb6ae74b27 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi @@ -847,7 +847,7 @@ i2c: bus@1e78a000 { 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 @@ fsim0: fsi@1e79b000 { 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";
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> --- arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts | 2 +- arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts | 2 +- arch/arm/boot/dts/aspeed/aspeed-bmc-opp-mowgli.dts | 2 +- arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts | 2 +- arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts | 2 +- arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts | 2 +- arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts | 2 +- arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts | 2 +- arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts | 2 +- arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-)