Re: [PATCH v2 32/48] arm64: dts: rockchip: align gpio-key node names with dtschema

[Krzysztof Kozlowski]

On 09/06/2022 15:57, Maya Matuszczyk wrote:
> czw., 9 cze 2022 o 13:56 Krzysztof Kozlowski
> <krzysztof.kozlowski@xxxxxxxxxx> napisał(a):
>>
>> The node names should be generic and DT schema expects certain pattern
>> (e.g. with key/button/switch).
>>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
>> ---
>>  arch/arm64/boot/dts/rockchip/rk3308-evb.dts   |  2 +-
>>  .../boot/dts/rockchip/rk3326-odroid-go2.dts   | 32 +++++++++----------
>>  .../boot/dts/rockchip/rk3328-nanopi-r2s.dts   |  2 +-
>>  arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi  |  2 +-
>>  .../boot/dts/rockchip/rk3368-geekbox.dts      |  2 +-
>>  .../dts/rockchip/rk3368-orion-r68-meta.dts    |  2 +-
>>  .../boot/dts/rockchip/rk3368-px5-evb.dts      |  2 +-
>>  arch/arm64/boot/dts/rockchip/rk3368-r88.dts   |  2 +-
>>  .../boot/dts/rockchip/rk3399-firefly.dts      |  2 +-
>>  .../dts/rockchip/rk3399-gru-chromebook.dtsi   |  2 +-
>>  .../boot/dts/rockchip/rk3399-gru-kevin.dts    |  2 +-
>>  .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi |  2 +-
>>  .../boot/dts/rockchip/rk3399-khadas-edge.dtsi |  2 +-
>>  .../boot/dts/rockchip/rk3399-nanopi-r4s.dts   |  4 +--
>>  .../boot/dts/rockchip/rk3399-nanopi4.dtsi     |  2 +-
>>  .../boot/dts/rockchip/rk3399-orangepi.dts     |  2 +-
>>  .../boot/dts/rockchip/rk3399-pinebook-pro.dts |  4 +--
>>  .../boot/dts/rockchip/rk3399-roc-pc.dtsi      |  2 +-
>>  .../boot/dts/rockchip/rk3399-rockpro64.dtsi   |  2 +-
>>  .../boot/dts/rockchip/rk3399-sapphire.dtsi    |  2 +-
>>  .../boot/dts/rockchip/rk3566-pinenote.dtsi    |  2 +-
>>  21 files changed, 38 insertions(+), 38 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb.dts
>> index 9b4f855ea5d4..4b5413b12bfa 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3308-evb.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb.dts
>> @@ -75,7 +75,7 @@ gpio-keys {
>>                 pinctrl-names = "default";
>>                 pinctrl-0 = <&pwr_key>;
>>
>> -               power {
>> +               power-key {
>>                         gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
>>                         linux,code = <KEY_POWER>;
>>                         label = "GPIO Key Power";
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
>> index ea0695b51ecd..72328dd993ee 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
>> @@ -71,82 +71,82 @@ gpio-keys {
>>                  * |------------------------------------------------|
>>                  */
>>
>> -               sw1 {
>> +               switch-1 {
> Wouldn't it make more sense to rename this and all other
> renamed nodes in this dts into "button-dpad-up" or "button-1",
> as on the physical device those are buttons and the naming
> scheme of "sw" + number seems to be a carryover from
> downstream sources.

Can be buttons. I assumed SW comes from some kind of switch.
I assume you mean only this Odroid Go2 DTS, because some other DTSes
(like EVB above) explicitly call it "Key Power".


Best regards,
Krzysztof