| Message ID | 20201124044910.2006209-1-msbarth@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [linux,dev-5.8] ARM: dts: aspeed: rainier: Set MAX31785 config | expand |
On Mon, 2020-11-23 at 22:49 -0600, Matthew Barth wrote: > Set the MAX31785 device configuration properties Reviewed-by: Eddie James <eajames@linux.ibm.com> > > Signed-off-by: Matthew Barth <msbarth@linux.ibm.com> > --- > arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 54 > ++++++++++++++++++++ > 1 file changed, 54 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts > b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts > index a4b77aec5424..4692c5e8f919 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts > @@ -732,24 +732,78 @@ fan0: fan@0 { > compatible = "pmbus-fan"; > reg = <0>; > tach-pulses = <2>; > + maxim,fan-rotor-input = "tach"; > + maxim,fan-pwm-freq = <25000>; > + maxim,fan-dual-tach; > + maxim,fan-no-watchdog; > + maxim,fan-no-fault-ramp; > + maxim,fan-ramp = <2>; > + maxim,fan-fault-pin-mon; > }; > > fan1: fan@1 { > compatible = "pmbus-fan"; > reg = <1>; > tach-pulses = <2>; > + maxim,fan-rotor-input = "tach"; > + maxim,fan-pwm-freq = <25000>; > + maxim,fan-dual-tach; > + maxim,fan-no-watchdog; > + maxim,fan-no-fault-ramp; > + maxim,fan-ramp = <2>; > + maxim,fan-fault-pin-mon; > }; > > fan2: fan@2 { > compatible = "pmbus-fan"; > reg = <2>; > tach-pulses = <2>; > + maxim,fan-rotor-input = "tach"; > + maxim,fan-pwm-freq = <25000>; > + maxim,fan-dual-tach; > + maxim,fan-no-watchdog; > + maxim,fan-no-fault-ramp; > + maxim,fan-ramp = <2>; > + maxim,fan-fault-pin-mon; > }; > > fan3: fan@3 { > compatible = "pmbus-fan"; > reg = <3>; > tach-pulses = <2>; > + maxim,fan-rotor-input = "tach"; > + maxim,fan-pwm-freq = <25000>; > + maxim,fan-dual-tach; > + maxim,fan-no-watchdog; > + maxim,fan-no-fault-ramp; > + maxim,fan-ramp = <2>; > + maxim,fan-fault-pin-mon; > + }; > + > + fan4: fan@4 { > + compatible = "pmbus-fan"; > + reg = <4>; > + tach-pulses = <2>; > + maxim,fan-rotor-input = "tach"; > + maxim,fan-pwm-freq = <25000>; > + maxim,fan-dual-tach; > + maxim,fan-no-watchdog; > + maxim,fan-no-fault-ramp; > + maxim,fan-ramp = <2>; > + maxim,fan-fault-pin-mon; > + }; > + > + fan5: fan@5 { > + compatible = "pmbus-fan"; > + reg = <5>; > + tach-pulses = <2>; > + maxim,fan-rotor-input = "tach"; > + maxim,fan-pwm-freq = <25000>; > + maxim,fan-dual-tach; > + maxim,fan-no-watchdog; > + maxim,fan-no-fault-ramp; > + maxim,fan-ramp = <2>; > + maxim,fan-fault-pin-mon; > }; > }; >
On Tue, 24 Nov 2020 at 04:49, Matthew Barth <msbarth@linux.ibm.com> wrote: > > Set the MAX31785 device configuration properties Andrew, As I understand it these properties are not upstream and we have no intention of making them so as the correct fix is to properly program the EEPROM in the fan controller with these settings. Can you clarify here? > > Signed-off-by: Matthew Barth <msbarth@linux.ibm.com> > --- > arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 54 ++++++++++++++++++++ > 1 file changed, 54 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts > index a4b77aec5424..4692c5e8f919 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts > @@ -732,24 +732,78 @@ fan0: fan@0 { > compatible = "pmbus-fan"; > reg = <0>; > tach-pulses = <2>; > + maxim,fan-rotor-input = "tach"; > + maxim,fan-pwm-freq = <25000>; > + maxim,fan-dual-tach; > + maxim,fan-no-watchdog; > + maxim,fan-no-fault-ramp; > + maxim,fan-ramp = <2>; > + maxim,fan-fault-pin-mon; > }; > > fan1: fan@1 { > compatible = "pmbus-fan"; > reg = <1>; > tach-pulses = <2>; > + maxim,fan-rotor-input = "tach"; > + maxim,fan-pwm-freq = <25000>; > + maxim,fan-dual-tach; > + maxim,fan-no-watchdog; > + maxim,fan-no-fault-ramp; > + maxim,fan-ramp = <2>; > + maxim,fan-fault-pin-mon; > }; > > fan2: fan@2 { > compatible = "pmbus-fan"; > reg = <2>; > tach-pulses = <2>; > + maxim,fan-rotor-input = "tach"; > + maxim,fan-pwm-freq = <25000>; > + maxim,fan-dual-tach; > + maxim,fan-no-watchdog; > + maxim,fan-no-fault-ramp; > + maxim,fan-ramp = <2>; > + maxim,fan-fault-pin-mon; > }; > > fan3: fan@3 { > compatible = "pmbus-fan"; > reg = <3>; > tach-pulses = <2>; > + maxim,fan-rotor-input = "tach"; > + maxim,fan-pwm-freq = <25000>; > + maxim,fan-dual-tach; > + maxim,fan-no-watchdog; > + maxim,fan-no-fault-ramp; > + maxim,fan-ramp = <2>; > + maxim,fan-fault-pin-mon; > + }; > + > + fan4: fan@4 { > + compatible = "pmbus-fan"; > + reg = <4>; > + tach-pulses = <2>; > + maxim,fan-rotor-input = "tach"; > + maxim,fan-pwm-freq = <25000>; > + maxim,fan-dual-tach; > + maxim,fan-no-watchdog; > + maxim,fan-no-fault-ramp; > + maxim,fan-ramp = <2>; > + maxim,fan-fault-pin-mon; > + }; > + > + fan5: fan@5 { > + compatible = "pmbus-fan"; > + reg = <5>; > + tach-pulses = <2>; > + maxim,fan-rotor-input = "tach"; > + maxim,fan-pwm-freq = <25000>; > + maxim,fan-dual-tach; > + maxim,fan-no-watchdog; > + maxim,fan-no-fault-ramp; > + maxim,fan-ramp = <2>; > + maxim,fan-fault-pin-mon; > }; > }; > > -- > 2.28.0 >
On Fri, 27 Nov 2020, at 15:24, Joel Stanley wrote: > On Tue, 24 Nov 2020 at 04:49, Matthew Barth <msbarth@linux.ibm.com> wrote: > > > > Set the MAX31785 device configuration properties > > Andrew, > > As I understand it these properties are not upstream Correct. > and we have no > intention of making them so Well, they were rejected last time I tried. I think there are some things I could try to fix, but I'm not optimistic that the fixes will get the binding changes across the line. > as the correct fix is to properly program > the EEPROM in the fan controller with these settings. Can you clarify > here? Right - I've been considering whether we could use a first-boot systemd service to program the fan controller settings from userspace using i2c[sg]et. Conceptually nice, but we may need to come up with a means to reprogram the chip after the fan card is replaced due to a fault or some such issue. I haven't put any effort in to prototyping the first-boot approach, so we should probably take this patch for now. Andrew > > > > > Signed-off-by: Matthew Barth <msbarth@linux.ibm.com> > > --- > > arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 54 ++++++++++++++++++++ > > 1 file changed, 54 insertions(+) > > > > diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts > > index a4b77aec5424..4692c5e8f919 100644 > > --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts > > +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts > > @@ -732,24 +732,78 @@ fan0: fan@0 { > > compatible = "pmbus-fan"; > > reg = <0>; > > tach-pulses = <2>; > > + maxim,fan-rotor-input = "tach"; > > + maxim,fan-pwm-freq = <25000>; > > + maxim,fan-dual-tach; > > + maxim,fan-no-watchdog; > > + maxim,fan-no-fault-ramp; > > + maxim,fan-ramp = <2>; > > + maxim,fan-fault-pin-mon; > > }; > > > > fan1: fan@1 { > > compatible = "pmbus-fan"; > > reg = <1>; > > tach-pulses = <2>; > > + maxim,fan-rotor-input = "tach"; > > + maxim,fan-pwm-freq = <25000>; > > + maxim,fan-dual-tach; > > + maxim,fan-no-watchdog; > > + maxim,fan-no-fault-ramp; > > + maxim,fan-ramp = <2>; > > + maxim,fan-fault-pin-mon; > > }; > > > > fan2: fan@2 { > > compatible = "pmbus-fan"; > > reg = <2>; > > tach-pulses = <2>; > > + maxim,fan-rotor-input = "tach"; > > + maxim,fan-pwm-freq = <25000>; > > + maxim,fan-dual-tach; > > + maxim,fan-no-watchdog; > > + maxim,fan-no-fault-ramp; > > + maxim,fan-ramp = <2>; > > + maxim,fan-fault-pin-mon; > > }; > > > > fan3: fan@3 { > > compatible = "pmbus-fan"; > > reg = <3>; > > tach-pulses = <2>; > > + maxim,fan-rotor-input = "tach"; > > + maxim,fan-pwm-freq = <25000>; > > + maxim,fan-dual-tach; > > + maxim,fan-no-watchdog; > > + maxim,fan-no-fault-ramp; > > + maxim,fan-ramp = <2>; > > + maxim,fan-fault-pin-mon; > > + }; > > + > > + fan4: fan@4 { > > + compatible = "pmbus-fan"; > > + reg = <4>; > > + tach-pulses = <2>; > > + maxim,fan-rotor-input = "tach"; > > + maxim,fan-pwm-freq = <25000>; > > + maxim,fan-dual-tach; > > + maxim,fan-no-watchdog; > > + maxim,fan-no-fault-ramp; > > + maxim,fan-ramp = <2>; > > + maxim,fan-fault-pin-mon; > > + }; > > + > > + fan5: fan@5 { > > + compatible = "pmbus-fan"; > > + reg = <5>; > > + tach-pulses = <2>; > > + maxim,fan-rotor-input = "tach"; > > + maxim,fan-pwm-freq = <25000>; > > + maxim,fan-dual-tach; > > + maxim,fan-no-watchdog; > > + maxim,fan-no-fault-ramp; > > + maxim,fan-ramp = <2>; > > + maxim,fan-fault-pin-mon; > > }; > > }; > > > > -- > > 2.28.0 > > >
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts index a4b77aec5424..4692c5e8f919 100644 --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts @@ -732,24 +732,78 @@ fan0: fan@0 { compatible = "pmbus-fan"; reg = <0>; tach-pulses = <2>; + maxim,fan-rotor-input = "tach"; + maxim,fan-pwm-freq = <25000>; + maxim,fan-dual-tach; + maxim,fan-no-watchdog; + maxim,fan-no-fault-ramp; + maxim,fan-ramp = <2>; + maxim,fan-fault-pin-mon; }; fan1: fan@1 { compatible = "pmbus-fan"; reg = <1>; tach-pulses = <2>; + maxim,fan-rotor-input = "tach"; + maxim,fan-pwm-freq = <25000>; + maxim,fan-dual-tach; + maxim,fan-no-watchdog; + maxim,fan-no-fault-ramp; + maxim,fan-ramp = <2>; + maxim,fan-fault-pin-mon; }; fan2: fan@2 { compatible = "pmbus-fan"; reg = <2>; tach-pulses = <2>; + maxim,fan-rotor-input = "tach"; + maxim,fan-pwm-freq = <25000>; + maxim,fan-dual-tach; + maxim,fan-no-watchdog; + maxim,fan-no-fault-ramp; + maxim,fan-ramp = <2>; + maxim,fan-fault-pin-mon; }; fan3: fan@3 { compatible = "pmbus-fan"; reg = <3>; tach-pulses = <2>; + maxim,fan-rotor-input = "tach"; + maxim,fan-pwm-freq = <25000>; + maxim,fan-dual-tach; + maxim,fan-no-watchdog; + maxim,fan-no-fault-ramp; + maxim,fan-ramp = <2>; + maxim,fan-fault-pin-mon; + }; + + fan4: fan@4 { + compatible = "pmbus-fan"; + reg = <4>; + tach-pulses = <2>; + maxim,fan-rotor-input = "tach"; + maxim,fan-pwm-freq = <25000>; + maxim,fan-dual-tach; + maxim,fan-no-watchdog; + maxim,fan-no-fault-ramp; + maxim,fan-ramp = <2>; + maxim,fan-fault-pin-mon; + }; + + fan5: fan@5 { + compatible = "pmbus-fan"; + reg = <5>; + tach-pulses = <2>; + maxim,fan-rotor-input = "tach"; + maxim,fan-pwm-freq = <25000>; + maxim,fan-dual-tach; + maxim,fan-no-watchdog; + maxim,fan-no-fault-ramp; + maxim,fan-ramp = <2>; + maxim,fan-fault-pin-mon; }; };
Set the MAX31785 device configuration properties Signed-off-by: Matthew Barth <msbarth@linux.ibm.com> --- arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 54 ++++++++++++++++++++ 1 file changed, 54 insertions(+)