| Message ID | aae27f45adb7cb0508b86cf4e72ced36@linux.vnet.ibm.com |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | [linux,dev-5.4] ARM: dts: Aspeed: witherspoon-128: Remove checkstop GPIO from gpio-keys | expand |
On Thu, 9 Apr 2020, at 03:41, bentyner wrote: > Attention handler will monitor the checkstop gpio via the character > device interface so it needs to not be defined. > > Signed-off-by: Ben Tyner <bentyner@linux.ibm.com> > --- > .../dts/aspeed-bmc-opp-witherspoon-128.dts | 40 +++++++++++++++++++ > 1 file changed, 40 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts > b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts > index 1ba673a49334..701d58b7f0dc 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts > @@ -4,6 +4,46 @@ > > #include "aspeed-bmc-opp-witherspoon.dts" > > +/ { > + gpio-keys { > + /delete-node/ checkstop; > + }; > +}; Is this literally just for witherspoon-128 or is it meant to be a generic change to witherspoon behaviour? The answer should be added to the commit message if this is specific to witherspoon-128 (and probably talk about why it's not necessary for witherspoon). > + > +&gpio { > + gpio-line-names = > + /*A0-A7*/ "","cfam-reset","","","","","fsi-mux","", > + /*B0-B7*/ "","","","","","air-water","","", > + /*C0-C7*/ "","","","","","","","", > + /*D0-D7*/ "fsi-enable","","","","","","","", > + /*E0-E7*/ "fsi-data","","","","","","","", > + /*F0-F7*/ "","","","","","","","", > + /*G0-G7*/ "","","","","","","","", > + /*H0-H7*/ "","","","","","","","", > + /*I0-I7*/ "","","","","","","","", > + /*J0-J7*/ "","","","","","","","", > + /*K0-K7*/ "","","","","","","","", > + /*L0-L7*/ "","","","","","","","", > + /*M0-M7*/ "","","","","","","","", > + /*N0-N7*/ "presence-ps1","","led-rear-fault","led-rear-power", > + "led-rear-id","","","", > + /*O0-O7*/ "","","","","","","","", > + /*P0-P7*/ "","","","","","","","presence-ps0", > + /*Q0-Q7*/ "","","","","","","","", > + /*R0-R7*/ "","","fsi-trans","","","power-button","","", > + /*S0-S7*/ "","","","","","","","", > + /*T0-T7*/ "","","","","","","","", > + /*U0-U7*/ "","","","","","","","", > + /*V0-V7*/ "","","","","","","","", > + /*W0-W7*/ "","","","","","","","", > + /*X0-X7*/ "","","","","","","","", > + /*Y0-Y7*/ "","","","","","","","", > + /*Z0-Z7*/ "","","","","","","","", > + /*AA0-AA7*/ "fsi-clock","","","","","","","", > + /*AB0-AB7*/ "","","","","","","","", > + /*AC0-AC7*/ "","","","","","","",""; > +}; I don't see that the checkstop gpio line is named here and so I don't think it's a relevant change? Why is it necessary in this patch? Andrew
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts index 1ba673a49334..701d58b7f0dc 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts @@ -4,6 +4,46 @@ #include "aspeed-bmc-opp-witherspoon.dts" +/ { + gpio-keys { + /delete-node/ checkstop; + }; +}; + +&gpio { + gpio-line-names = + /*A0-A7*/ "","cfam-reset","","","","","fsi-mux","", + /*B0-B7*/ "","","","","","air-water","","", + /*C0-C7*/ "","","","","","","","", + /*D0-D7*/ "fsi-enable","","","","","","","", + /*E0-E7*/ "fsi-data","","","","","","","", + /*F0-F7*/ "","","","","","","","", + /*G0-G7*/ "","","","","","","","", + /*H0-H7*/ "","","","","","","","", + /*I0-I7*/ "","","","","","","","", + /*J0-J7*/ "","","","","","","","", + /*K0-K7*/ "","","","","","","","", + /*L0-L7*/ "","","","","","","","", + /*M0-M7*/ "","","","","","","","", + /*N0-N7*/ "presence-ps1","","led-rear-fault","led-rear-power", + "led-rear-id","","","", + /*O0-O7*/ "","","","","","","","", + /*P0-P7*/ "","","","","","","","presence-ps0", + /*Q0-Q7*/ "","","","","","","","", + /*R0-R7*/ "","","fsi-trans","","","power-button","","", + /*S0-S7*/ "","","","","","","","", + /*T0-T7*/ "","","","","","","","", + /*U0-U7*/ "","","","","","","","", + /*V0-V7*/ "","","","","","","","", + /*W0-W7*/ "","","","","","","","", + /*X0-X7*/ "","","","","","","","", + /*Y0-Y7*/ "","","","","","","","", + /*Z0-Z7*/ "","","","","","","","", + /*AA0-AA7*/ "fsi-clock","","","","","","","", + /*AB0-AB7*/ "","","","","","","","", + /*AC0-AC7*/ "","","","","","","",""; +}; + &fmc { status = "okay";
Attention handler will monitor the checkstop gpio via the character device interface so it needs to not be defined. Signed-off-by: Ben Tyner <bentyner@linux.ibm.com> --- .../dts/aspeed-bmc-opp-witherspoon-128.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+)