Message ID | HK2PR02MB15240578C4FBBB5691498874D97E0@HK2PR02MB1524.apcprd02.prod.outlook.com |
---|---|
State | Accepted, archived |
Headers | show |
Series | arm:dts: add max31785 to Garrison device tree | expand |
On Fri, Sep 29, 2017 at 1:15 PM, Yi Li <adamliyi@msn.com> wrote: > Add max31785 device tree node to enable Fan Control on Garrison. Looks okay to me. I'll get Andrew's ack on the bindings before I merge. Cheers, Joel > > Signed-off-by: Yi Li <adamliyi@msn.com> > --- > arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts | 89 +++++++++++++++++++++++++++ > 1 file changed, 89 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts > index c67fe58..6b96e36 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts > @@ -63,6 +63,95 @@ > status = "okay"; > }; > > +&i2c3 { > + status = "okay"; > + > + // FIR (fan / SATA backplane) > + max31785@52 { > + compatible = "max,max31785"; > + reg = <0x52>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + 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; > + }; > + > + 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; > + }; > + > + 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; > + }; > + > + 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; > + }; > + > + 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; > + }; > + > + 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; > + }; > + }; > +}; > > &i2c4 { > status = "okay"; > -- > 1.9.1 >
On Fri, Sep 29, 2017 at 3:29 PM, Joel Stanley <joel@jms.id.au> wrote: > On Fri, Sep 29, 2017 at 1:15 PM, Yi Li <adamliyi@msn.com> wrote: >> Add max31785 device tree node to enable Fan Control on Garrison. > > Looks okay to me. I'll get Andrew's ack on the bindings before I merge. Andrew did an over-the-shoulder code review and acked this. Merged into dev-4.10. Cheers, Joel
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts index c67fe58..6b96e36 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts @@ -63,6 +63,95 @@ status = "okay"; }; +&i2c3 { + status = "okay"; + + // FIR (fan / SATA backplane) + max31785@52 { + compatible = "max,max31785"; + reg = <0x52>; + #address-cells = <1>; + #size-cells = <0>; + + 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; + }; + + 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; + }; + + 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; + }; + + 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; + }; + + 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; + }; + + 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; + }; + }; +}; &i2c4 { status = "okay";
Add max31785 device tree node to enable Fan Control on Garrison. Signed-off-by: Yi Li <adamliyi@msn.com> --- arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts | 89 +++++++++++++++++++++++++++ 1 file changed, 89 insertions(+)