[PATCH 1/2] MIPS: dts: correct gpio-keys names and properties
Paul Cercueil
paul at crapouillou.net
Fri Jun 24 11:40:47 PDT 2022
Hi Krzysztof,
Le ven., juin 24 2022 at 19:07:39 +0200, Krzysztof Kozlowski
<krzysztof.kozlowski at linaro.org> a écrit :
> gpio-keys children do not use unit addresses.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski at linaro.org>
>
> ---
>
> See:
> https://lore.kernel.org/all/20220616005224.18391-1-krzysztof.kozlowski@linaro.org/
> ---
> arch/mips/boot/dts/img/pistachio_marduk.dts | 4 +--
> arch/mips/boot/dts/ingenic/gcw0.dts | 31
> +++++++++----------
> arch/mips/boot/dts/ingenic/rs90.dts | 18 +++++------
> arch/mips/boot/dts/pic32/pic32mzda_sk.dts | 9 ++----
> .../boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 6 ++--
> arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 4 +--
> .../mips/boot/dts/qca/ar9331_dragino_ms14.dts | 6 ++--
> arch/mips/boot/dts/qca/ar9331_omega.dts | 4 +--
> .../qca/ar9331_openembed_som9331_board.dts | 4 +--
> arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 8 ++---
> 10 files changed, 37 insertions(+), 57 deletions(-)
>
> diff --git a/arch/mips/boot/dts/img/pistachio_marduk.dts
> b/arch/mips/boot/dts/img/pistachio_marduk.dts
> index a8708783f04b..a8da2f992b1a 100644
> --- a/arch/mips/boot/dts/img/pistachio_marduk.dts
> +++ b/arch/mips/boot/dts/img/pistachio_marduk.dts
> @@ -59,12 +59,12 @@ led-1 {
>
> keys {
> compatible = "gpio-keys";
> - button at 1 {
> + button-1 {
> label = "Button 1";
> linux,code = <0x101>; /* BTN_1 */
> gpios = <&gpio3 6 GPIO_ACTIVE_LOW>;
> };
> - button at 2 {
> + button-2 {
> label = "Button 2";
> linux,code = <0x102>; /* BTN_2 */
> gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
> diff --git a/arch/mips/boot/dts/ingenic/gcw0.dts
> b/arch/mips/boot/dts/ingenic/gcw0.dts
> index 4abb0318416c..5d33f26fd28c 100644
> --- a/arch/mips/boot/dts/ingenic/gcw0.dts
> +++ b/arch/mips/boot/dts/ingenic/gcw0.dts
> @@ -130,89 +130,86 @@ backlight: backlight {
>
> gpio-keys {
> compatible = "gpio-keys";
> - #address-cells = <1>;
> - #size-cells = <0>;
Are you sure you can remove these?
Looking at paragraph 2.3.5 of the DT spec, I would think they have to
stay (although with #address-cells = <0>).
Cheers,
-Paul
> -
> autorepeat;
>
> - button at 0 {
> + button-0 {
> label = "D-pad up";
> linux,code = <KEY_UP>;
> linux,can-disable;
> gpios = <&gpe 21 GPIO_ACTIVE_LOW>;
> };
>
> - button at 1 {
> + button-1 {
> label = "D-pad down";
> linux,code = <KEY_DOWN>;
> linux,can-disable;
> gpios = <&gpe 25 GPIO_ACTIVE_LOW>;
> };
>
> - button at 2 {
> + button-2 {
> label = "D-pad left";
> linux,code = <KEY_LEFT>;
> linux,can-disable;
> gpios = <&gpe 23 GPIO_ACTIVE_LOW>;
> };
>
> - button at 3 {
> + button-3 {
> label = "D-pad right";
> linux,code = <KEY_RIGHT>;
> linux,can-disable;
> gpios = <&gpe 24 GPIO_ACTIVE_LOW>;
> };
>
> - button at 4 {
> + button-4 {
> label = "Button A";
> linux,code = <KEY_LEFTCTRL>;
> linux,can-disable;
> gpios = <&gpe 29 GPIO_ACTIVE_LOW>;
> };
>
> - button at 5 {
> + button-5 {
> label = "Button B";
> linux,code = <KEY_LEFTALT>;
> linux,can-disable;
> gpios = <&gpe 20 GPIO_ACTIVE_LOW>;
> };
>
> - button at 6 {
> + button-6 {
> label = "Button Y";
> linux,code = <KEY_SPACE>;
> linux,can-disable;
> gpios = <&gpe 27 GPIO_ACTIVE_LOW>;
> };
>
> - button at 7 {
> + button-7 {
> label = "Button X";
> linux,code = <KEY_LEFTSHIFT>;
> linux,can-disable;
> gpios = <&gpe 28 GPIO_ACTIVE_LOW>;
> };
>
> - button at 8 {
> + button-8 {
> label = "Left shoulder button";
> linux,code = <KEY_TAB>;
> linux,can-disable;
> gpios = <&gpb 20 GPIO_ACTIVE_LOW>;
> };
>
> - button at 9 {
> + button-9 {
> label = "Right shoulder button";
> linux,code = <KEY_BACKSPACE>;
> linux,can-disable;
> gpios = <&gpe 26 GPIO_ACTIVE_LOW>;
> };
>
> - button at 10 {
> + button-10 {
> label = "Start button";
> linux,code = <KEY_ENTER>;
> linux,can-disable;
> gpios = <&gpb 21 GPIO_ACTIVE_LOW>;
> };
>
> - button at 11 {
> + button-11 {
> label = "Select button";
> linux,code = <KEY_ESC>;
> linux,can-disable;
> @@ -223,7 +220,7 @@ button at 11 {
> gpios = <&gpd 18 GPIO_ACTIVE_HIGH>;
> };
>
> - button at 12 {
> + button-12 {
> label = "Power slider";
> linux,code = <KEY_POWER>;
> linux,can-disable;
> @@ -231,7 +228,7 @@ button at 12 {
> wakeup-source;
> };
>
> - button at 13 {
> + button-13 {
> label = "Power hold";
> linux,code = <KEY_PAUSE>;
> linux,can-disable;
> diff --git a/arch/mips/boot/dts/ingenic/rs90.dts
> b/arch/mips/boot/dts/ingenic/rs90.dts
> index 74fee7f01352..e8df70dd42bf 100644
> --- a/arch/mips/boot/dts/ingenic/rs90.dts
> +++ b/arch/mips/boot/dts/ingenic/rs90.dts
> @@ -52,53 +52,51 @@ backlight: backlight {
>
> keys at 0 {
> compatible = "gpio-keys";
> - #address-cells = <1>;
> - #size-cells = <0>;
>
> - key at 0 {
> + key-0 {
> label = "D-pad up";
> linux,code = <KEY_UP>;
> gpios = <&gpc 10 GPIO_ACTIVE_LOW>;
> };
>
> - key at 1 {
> + key-1 {
> label = "D-pad down";
> linux,code = <KEY_DOWN>;
> gpios = <&gpc 11 GPIO_ACTIVE_LOW>;
> };
>
> - key at 2 {
> + key-2 {
> label = "D-pad left";
> linux,code = <KEY_LEFT>;
> gpios = <&gpb 31 GPIO_ACTIVE_LOW>;
> };
>
> - key at 3 {
> + key-3 {
> label = "D-pad right";
> linux,code = <KEY_RIGHT>;
> gpios = <&gpd 21 GPIO_ACTIVE_LOW>;
> };
>
> - key at 4 {
> + key-4 {
> label = "Button A";
> linux,code = <KEY_LEFTCTRL>;
> gpios = <&gpc 31 GPIO_ACTIVE_LOW>;
> };
>
> - key at 5 {
> + key-5 {
> label = "Button B";
> linux,code = <KEY_LEFTALT>;
> gpios = <&gpc 30 GPIO_ACTIVE_LOW>;
> };
>
> - key at 6 {
> + key-6 {
> label = "Right shoulder button";
> linux,code = <KEY_BACKSPACE>;
> gpios = <&gpc 12 GPIO_ACTIVE_LOW>;
> debounce-interval = <10>;
> };
>
> - key at 7 {
> + key-7 {
> label = "Start button";
> linux,code = <KEY_ENTER>;
> gpios = <&gpd 17 GPIO_ACTIVE_LOW>;
> diff --git a/arch/mips/boot/dts/pic32/pic32mzda_sk.dts
> b/arch/mips/boot/dts/pic32/pic32mzda_sk.dts
> index d7fa5d55dbf3..ab70637bbec5 100644
> --- a/arch/mips/boot/dts/pic32/pic32mzda_sk.dts
> +++ b/arch/mips/boot/dts/pic32/pic32mzda_sk.dts
> @@ -52,22 +52,19 @@ keys0 {
> pinctrl-0 = <&user_buttons_s0>;
> pinctrl-names = "default";
>
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - button at sw1 {
> + button-1 {
> label = "ESC";
> linux,code = <1>;
> gpios = <&gpio1 12 0>;
> };
>
> - button at sw2 {
> + button-2 {
> label = "Home";
> linux,code = <102>;
> gpios = <&gpio1 13 0>;
> };
>
> - button at sw3 {
> + button-3 {
> label = "Menu";
> linux,code = <139>;
> gpios = <&gpio1 14 0>;
> diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> index 7fccf6357225..f3dff4009ab5 100644
> --- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> +++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> @@ -23,17 +23,15 @@ extosc: ref {
>
> gpio-keys {
> compatible = "gpio-keys";
> - #address-cells = <1>;
> - #size-cells = <0>;
>
> - button at 0 {
> + button-0 {
> label = "reset";
> linux,code = <KEY_RESTART>;
> gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
> debounce-interval = <60>;
> };
>
> - button at 1 {
> + button-1 {
> label = "qss";
> linux,code = <KEY_WPS_BUTTON>;
> gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
> diff --git a/arch/mips/boot/dts/qca/ar9331_dpt_module.dts
> b/arch/mips/boot/dts/qca/ar9331_dpt_module.dts
> index 7695d326df11..c857cd22f7db 100644
> --- a/arch/mips/boot/dts/qca/ar9331_dpt_module.dts
> +++ b/arch/mips/boot/dts/qca/ar9331_dpt_module.dts
> @@ -33,10 +33,8 @@ led-0 {
>
> gpio-keys {
> compatible = "gpio-keys";
> - #address-cells = <1>;
> - #size-cells = <0>;
>
> - button at 0 {
> + button-0 {
> label = "reset";
> linux,code = <KEY_RESTART>;
> gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
> diff --git a/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts
> b/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts
> index d38aa73f1a2e..40e4c5da0e65 100644
> --- a/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts
> +++ b/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts
> @@ -49,16 +49,14 @@ system {
>
> gpio-keys {
> compatible = "gpio-keys";
> - #address-cells = <1>;
> - #size-cells = <0>;
>
> - button at 0 {
> + button-0 {
> label = "jumpstart";
> linux,code = <KEY_WPS_BUTTON>;
> gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
> };
>
> - button at 1 {
> + button-1 {
> label = "reset";
> linux,code = <KEY_RESTART>;
> gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
> diff --git a/arch/mips/boot/dts/qca/ar9331_omega.dts
> b/arch/mips/boot/dts/qca/ar9331_omega.dts
> index 11778abacf66..ed184d861d5f 100644
> --- a/arch/mips/boot/dts/qca/ar9331_omega.dts
> +++ b/arch/mips/boot/dts/qca/ar9331_omega.dts
> @@ -31,10 +31,8 @@ system {
>
> gpio-keys {
> compatible = "gpio-keys";
> - #address-cells = <1>;
> - #size-cells = <0>;
>
> - button at 0 {
> + button-0 {
> label = "reset";
> linux,code = <KEY_RESTART>;
> gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
> diff --git
> a/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts
> b/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts
> index e6622f8e8c2b..dc65ebd60bbc 100644
> --- a/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts
> +++ b/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts
> @@ -33,10 +33,8 @@ led-0 {
>
> gpio-keys {
> compatible = "gpio-keys";
> - #address-cells = <1>;
> - #size-cells = <0>;
>
> - button at 0 {
> + button-0 {
> label = "reset";
> linux,code = <KEY_RESTART>;
> gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
> diff --git a/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts
> b/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts
> index c8290d36cfbe..5f424c2cd781 100644
> --- a/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts
> +++ b/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts
> @@ -49,22 +49,20 @@ led3g {
>
> gpio-keys {
> compatible = "gpio-keys";
> - #address-cells = <1>;
> - #size-cells = <0>;
>
> - button at 0 {
> + button-0 {
> label = "wps";
> linux,code = <KEY_WPS_BUTTON>;
> gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
> };
>
> - button at 1 {
> + button-1 {
> label = "sw1";
> linux,code = <BTN_0>;
> gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
> };
>
> - button at 2 {
> + button-2 {
> label = "sw2";
> linux,code = <BTN_1>;
> gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
> --
> 2.34.1
>
More information about the linux-arm-kernel
mailing list