| Message ID | 20210308225419.46530-13-eajames@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | Rainier and Everest system updates | expand |
On Mon, 8 Mar 2021 at 22:56, Eddie James <eajames@linux.ibm.com> wrote: > > The 4U fans didn't have the correct properties since the fan nodes > were redefined. Fix this by referencing each fan individually and > adding the differences to the 4U fans. Was this commit message for a different version of the patch? It doesn't quite make sense to me. If you go ahead with the common device tree approach, you could consider only adding the dual-fan-tach property to machines that support it (or not, depending on the common case). > > Signed-off-by: Eddie James <eajames@linux.ibm.com> > --- > arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts > index 291f7d6c9979..f7fd3b3c90d0 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts > @@ -22,16 +22,30 @@ power-supply@6b { > > &fan0 { > tach-pulses = <4>; > + /delete-property/ maxim,fan-dual-tach; > }; > > &fan1 { > tach-pulses = <4>; > + /delete-property/ maxim,fan-dual-tach; > }; > > &fan2 { > tach-pulses = <4>; > + /delete-property/ maxim,fan-dual-tach; > }; > > &fan3 { > tach-pulses = <4>; > + /delete-property/ maxim,fan-dual-tach; > +}; > + > +&fan4 { > + tach-pulses = <4>; > + /delete-property/ maxim,fan-dual-tach; > +}; > + > +&fan5 { > + tach-pulses = <4>; > + /delete-property/ maxim,fan-dual-tach; > }; > -- > 2.27.0 >
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts index 291f7d6c9979..f7fd3b3c90d0 100644 --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts @@ -22,16 +22,30 @@ power-supply@6b { &fan0 { tach-pulses = <4>; + /delete-property/ maxim,fan-dual-tach; }; &fan1 { tach-pulses = <4>; + /delete-property/ maxim,fan-dual-tach; }; &fan2 { tach-pulses = <4>; + /delete-property/ maxim,fan-dual-tach; }; &fan3 { tach-pulses = <4>; + /delete-property/ maxim,fan-dual-tach; +}; + +&fan4 { + tach-pulses = <4>; + /delete-property/ maxim,fan-dual-tach; +}; + +&fan5 { + tach-pulses = <4>; + /delete-property/ maxim,fan-dual-tach; };
The 4U fans didn't have the correct properties since the fan nodes were redefined. Fix this by referencing each fan individually and adding the differences to the 4U fans. Signed-off-by: Eddie James <eajames@linux.ibm.com> --- arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts | 14 ++++++++++++++ 1 file changed, 14 insertions(+)