Re: [PATCH] riscv: dts: align gpio-key node names with dtschema

[Palmer Dabbelt <palmer@xxxxxxxxxxx>]

On Fri, 24 Jun 2022 10:08:11 PDT (-0700), krzysztof.kozlowski@xxxxxxxxxx wrote:
> 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>
>
> ---
>
> See: https://lore.kernel.org/all/20220616005224.18391-1-krzysztof.kozlowski@xxxxxxxxxx/
> ---
>  arch/riscv/boot/dts/canaan/canaan_kd233.dts     | 2 +-
>  arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts  | 2 +-
>  arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts | 2 +-
>  arch/riscv/boot/dts/canaan/sipeed_maix_go.dts   | 6 +++---
>  arch/riscv/boot/dts/canaan/sipeed_maixduino.dts | 2 +-
>  5 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/riscv/boot/dts/canaan/canaan_kd233.dts b/arch/riscv/boot/dts/canaan/canaan_kd233.dts
> index 039b92abf046..f72540bd14a3 100644
> --- a/arch/riscv/boot/dts/canaan/canaan_kd233.dts
> +++ b/arch/riscv/boot/dts/canaan/canaan_kd233.dts
> @@ -35,7 +35,7 @@ led1 {
>  	gpio-keys {
>  		compatible = "gpio-keys";
>
> -		key0 {
> +		key {
>  			label = "KEY0";
>  			linux,code = <BTN_0>;
>  			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
> diff --git a/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts b/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts
> index b9e30df127fe..8abdbe26a1d0 100644
> --- a/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts
> +++ b/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts
> @@ -47,7 +47,7 @@ led2 {
>  	gpio-keys {
>  		compatible = "gpio-keys";
>
> -		boot {
> +		key-boot {
>  			label = "BOOT";
>  			linux,code = <BTN_0>;
>  			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
> diff --git a/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts b/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts
> index 8d23401b0bbb..3c6df1ecf76f 100644
> --- a/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts
> +++ b/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts
> @@ -52,7 +52,7 @@ led2 {
>  	gpio-keys {
>  		compatible = "gpio-keys";
>
> -		boot {
> +		key-boot {
>  			label = "BOOT";
>  			linux,code = <BTN_0>;
>  			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
> diff --git a/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts b/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts
> index 24fd83b43d9d..03c9843d503e 100644
> --- a/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts
> +++ b/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts
> @@ -46,19 +46,19 @@ led2 {
>  	gpio-keys {
>  		compatible = "gpio-keys";
>
> -		up {
> +		key-up {
>  			label = "UP";
>  			linux,code = <BTN_1>;
>  			gpios = <&gpio1_0 7 GPIO_ACTIVE_LOW>;
>  		};
>
> -		press {
> +		key-press {
>  			label = "PRESS";
>  			linux,code = <BTN_0>;
>  			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
>  		};
>
> -		down {
> +		key-down {
>  			label = "DOWN";
>  			linux,code = <BTN_2>;
>  			gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
> diff --git a/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts b/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts
> index 25341f38292a..7164ad063178 100644
> --- a/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts
> +++ b/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts
> @@ -23,7 +23,7 @@ chosen {
>  	gpio-keys {
>  		compatible = "gpio-keys";
>
> -		boot {
> +		key-boot {
>  			label = "BOOT";
>  			linux,code = <BTN_0>;
>  			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;

Thanks, this is on fixes.