Message ID | 20200206170234.84288-1-geissonator@gmail.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | d5ece55c1874a6f29bf610f593e2bdf14a477ff2 |
Headers | show |
Series | [v3] ARM: dts: aspeed: witherspoon: Add gpio line names | expand |
On Thu, 6 Feb 2020 at 17:03, Andrew Geissler <geissonator@gmail.com> wrote: > > From: Andrew Geissler <geissonator@yahoo.com> > > Name the GPIOs to help userspace work with them. The names describe the > functionality the lines provide, not the net or ball name. This makes it > easier to share userspace code across different systems and makes the > use of the lines more obvious. > > Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Reviewed-by: Joel Stanley <joel@jms.id.au> I will wait for Andrew before merging, but this looks good to me. > --- > v3: added more detail to commit message > removed linux dev-5.4 from PATCH header > removed redundant status from gpio > removed blank line > v2: added upstream to patch > prepended fsi- on fsi related gpios > prepended led- on led related gpios > prepended presence on presence related gpios > dropped pin_gpio_a1 definition > --- > .../boot/dts/aspeed-bmc-opp-witherspoon.dts | 34 +++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > index 515f0f208ee6..2269c73b8987 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > @@ -193,6 +193,40 @@ > > }; > > +&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*/ "","","checkstop","","","","","", > + /*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"; > > -- > 2.21.0 (Apple Git-122) >
On Mon, 10 Feb 2020, at 12:59, Joel Stanley wrote: > On Thu, 6 Feb 2020 at 17:03, Andrew Geissler <geissonator@gmail.com> wrote: > > > > From: Andrew Geissler <geissonator@yahoo.com> > > > > Name the GPIOs to help userspace work with them. The names describe the > > functionality the lines provide, not the net or ball name. This makes it > > easier to share userspace code across different systems and makes the > > use of the lines more obvious. > > > > Signed-off-by: Andrew Geissler <geissonator@yahoo.com> > > Reviewed-by: Joel Stanley <joel@jms.id.au> > > I will wait for Andrew before merging, but this looks good to me. To the best of my knowledge this is the only supported approach. I haven't checked the mapping of gpio lines to functions, but for the concept: Acked-by: Andrew Jeffery <andrew@aj.id.au> Andrew
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts index 515f0f208ee6..2269c73b8987 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts @@ -193,6 +193,40 @@ }; +&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*/ "","","checkstop","","","","","", + /*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";