From nobody Sun Sep 22 01:35:38 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18305C433EF for ; Thu, 9 Jun 2022 11:45:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244502AbiFILp1 (ORCPT ); Thu, 9 Jun 2022 07:45:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244354AbiFILmg (ORCPT ); Thu, 9 Jun 2022 07:42:36 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 173631F1297 for ; Thu, 9 Jun 2022 04:40:59 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id bg6so27098588ejb.0 for ; Thu, 09 Jun 2022 04:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4EZfS7ATgWCdgh/EfjHHInnvBBYRuwXN7niAgItceFc=; b=CL/YAlmkeRD0DlhrH9j2yhdcNzher3dmz/PL/hXJLFJqSY9UIwD3gcZnJu8cEOvKI+ Cj4FJ3wXkVILCXq+zJyT9c2HtXs61AaB58ZfG3AnO7939MgMHRG+09usTgc3J1nmWfTN CND6MbTQ+bDJBmkImQ/3ou0VLJsa6Wyi3Hw+Fws/KrK/q8T38x3wB4qaJnCDsthDcVVi BAD37ubyiLNUGZk6d0CAD4M41rIef4hPLhn7PnehSkat4IaWNOmv4pb7Vr9+KgEJc3l8 uJekmqbp6uiM7Kl3WxoYKKN2JIE0ob+5NFhBNcaJX5ie2bosl/v18IHakGWpJ0WfBodr 3XlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4EZfS7ATgWCdgh/EfjHHInnvBBYRuwXN7niAgItceFc=; b=rfkQBDkaMX7E2FHwjF4V/eriz1zvwpukozys1EScqGzfZ4MFy3hd/Dok37dNH4ajQy DA6a/4dCzVIUfd9KaPDmsay4oxiVGrVqsqRLnFCVJYn1y6qQYaFkGfrl/qT0EL4PmZkY 9I7lB17mlz002XS+jA2nCqxSIDyiYoLCPyYbO/3bWi6Cx/i87UEb2qY9xQS+WKTVibY9 I9iPoblSCC/JQJ9/3ofjYjx7hd4yjW5Av2uV72etik4jXopU+8O4i48uM9KwxbPDcpoT Oz6n9UEq4NsVMd77wo/4iNFDMxYMy88EXngXhBvK8EPLONIEBT0KsM67SMGM3z6qKhYB gGcg== X-Gm-Message-State: AOAM531fVyqRPJrnH4eHiT8qeDQBUEgQazzP21yMx3rw9ZNUgQSwLo67 Wavw85FE3gLclNI57onkw6B8oQ== X-Google-Smtp-Source: ABdhPJxIAr1tPW99GAb7omkhMgDBWTW2cbyUU8dAqS/1mqEHmaXOEBhSAJb9/kUdM6ncogXHU74jow== X-Received: by 2002:a17:907:2d24:b0:711:d584:f118 with SMTP id gs36-20020a1709072d2400b00711d584f118mr16738464ejc.238.1654774859391; Thu, 09 Jun 2022 04:40:59 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id bk2-20020a170906b0c200b006fef557bb7asm10498662ejb.80.2022.06.09.04.40.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 04:40:58 -0700 (PDT) From: Krzysztof Kozlowski To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Rob Herring , Krzysztof Kozlowski , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Peter Rosin , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 44/48] ARM: dts: at91: align gpio-key node names with dtschema Date: Thu, 9 Jun 2022 13:40:43 +0200 Message-Id: <20220609114047.380793-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220609113721.379932-1-krzysztof.kozlowski@linaro.org> References: <20220609113721.379932-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The node names should be generic and DT schema expects certain pattern (e.g. with key/button/switch). Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/at91-foxg20.dts | 4 ++-- arch/arm/boot/dts/at91-gatwick.dts | 2 +- arch/arm/boot/dts/at91-kizbox.dts | 6 +++--- arch/arm/boot/dts/at91-kizbox2-common.dtsi | 8 ++++---- arch/arm/boot/dts/at91-kizbox3-hs.dts | 12 ++++++------ arch/arm/boot/dts/at91-kizboxmini-common.dtsi | 4 ++-- arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 2 +- arch/arm/boot/dts/at91-qil_a9260.dts | 2 +- arch/arm/boot/dts/at91-sam9x60ek.dts | 4 ++-- arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 4 ++-- arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 4 ++-- arch/arm/boot/dts/at91-sama5d2_icp.dts | 4 ++-- arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 4 ++-- arch/arm/boot/dts/at91-sama5d2_xplained.dts | 4 ++-- arch/arm/boot/dts/at91-sama5d3_xplained.dts | 4 ++-- arch/arm/boot/dts/at91-sama5d4_xplained.dts | 4 ++-- arch/arm/boot/dts/at91-sama5d4ek.dts | 4 ++-- arch/arm/boot/dts/at91-sama7g5ek.dts | 4 ++-- arch/arm/boot/dts/at91-wb45n.dts | 2 +- arch/arm/boot/dts/at91-wb50n.dts | 2 +- arch/arm/boot/dts/at91sam9260ek.dts | 6 +++--- arch/arm/boot/dts/at91sam9261ek.dts | 10 +++++----- arch/arm/boot/dts/at91sam9263ek.dts | 6 +++--- arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 6 +++--- .../dts/at91sam9g25-gardena-smart-gateway.dts | 2 +- arch/arm/boot/dts/at91sam9m10g45ek.dts | 16 ++++++++-------- arch/arm/boot/dts/at91sam9n12ek.dts | 4 ++-- arch/arm/boot/dts/at91sam9rlek.dts | 6 +++--- 28 files changed, 70 insertions(+), 70 deletions(-) diff --git a/arch/arm/boot/dts/at91-foxg20.dts b/arch/arm/boot/dts/at91-fox= g20.dts index 7edf057047f8..9dfd5de808d1 100644 --- a/arch/arm/boot/dts/at91-foxg20.dts +++ b/arch/arm/boot/dts/at91-foxg20.dts @@ -155,10 +155,10 @@ user_led { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - btn { + button { label =3D "Button"; gpios =3D <&pioC 4 GPIO_ACTIVE_LOW>; linux,code =3D <0x103>; diff --git a/arch/arm/boot/dts/at91-gatwick.dts b/arch/arm/boot/dts/at91-ga= twick.dts index 5a81cab5fc3a..2c718cf84d7b 100644 --- a/arch/arm/boot/dts/at91-gatwick.dts +++ b/arch/arm/boot/dts/at91-gatwick.dts @@ -13,7 +13,7 @@ / { model =3D "Laird Workgroup Bridge 50N - Project Gatwick"; compatible =3D "laird,gatwick", "laird,wb50n", "atmel,sama5d31", "atmel,s= ama5d3", "atmel,sama5"; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; autorepeat; =20 diff --git a/arch/arm/boot/dts/at91-kizbox.dts b/arch/arm/boot/dts/at91-kiz= box.dts index 3b8812fcd854..87e972eb2ba6 100644 --- a/arch/arm/boot/dts/at91-kizbox.dts +++ b/arch/arm/boot/dts/at91-kizbox.dts @@ -28,19 +28,19 @@ main_xtal { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; #address-cells =3D <1>; #size-cells =3D <0>; =20 - reset { + button-reset { label =3D "PB_RST"; gpios =3D <&pioB 30 GPIO_ACTIVE_HIGH>; linux,code =3D <0x100>; wakeup-source; }; =20 - user { + button-user { label =3D "PB_USER"; gpios =3D <&pioB 31 GPIO_ACTIVE_HIGH>; linux,code =3D <0x101>; diff --git a/arch/arm/boot/dts/at91-kizbox2-common.dtsi b/arch/arm/boot/dts= /at91-kizbox2-common.dtsi index c08834ddf07b..ed7146e23147 100644 --- a/arch/arm/boot/dts/at91-kizbox2-common.dtsi +++ b/arch/arm/boot/dts/at91-kizbox2-common.dtsi @@ -31,26 +31,26 @@ main_xtal { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; #address-cells =3D <1>; #size-cells =3D <0>; =20 - prog { + button-prog { label =3D "PB_PROG"; gpios =3D <&pioE 27 GPIO_ACTIVE_LOW>; linux,code =3D <0x102>; wakeup-source; }; =20 - reset { + button-reset { label =3D "PB_RST"; gpios =3D <&pioE 29 GPIO_ACTIVE_LOW>; linux,code =3D <0x100>; wakeup-source; }; =20 - user { + button-user { label =3D "PB_USER"; gpios =3D <&pioE 31 GPIO_ACTIVE_HIGH>; linux,code =3D <0x101>; diff --git a/arch/arm/boot/dts/at91-kizbox3-hs.dts b/arch/arm/boot/dts/at91= -kizbox3-hs.dts index 2799b2a1f4d2..f76e2e0b41ae 100644 --- a/arch/arm/boot/dts/at91-kizbox3-hs.dts +++ b/arch/arm/boot/dts/at91-kizbox3-hs.dts @@ -55,7 +55,7 @@ led-6 { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; pinctrl-names =3D "default" , "default", "default", "default", "default" ; @@ -68,35 +68,35 @@ &pinctrl_pio_io_reset &pinctrl_pio_zbe_rst>; pinctrl-4 =3D <&pinctrl_pio_input>; =20 - SW1 { + switch-1 { label =3D "SW1"; gpios =3D <&pioA PIN_PA29 GPIO_ACTIVE_LOW>; linux,code =3D <0x101>; wakeup-source; }; =20 - SW2 { + switch-2 { label =3D "SW2"; gpios =3D <&pioA PIN_PA18 GPIO_ACTIVE_LOW>; linux,code =3D <0x102>; wakeup-source; }; =20 - SW3 { + switch-3 { label =3D "SW3"; gpios =3D <&pioA PIN_PA22 GPIO_ACTIVE_LOW>; linux,code =3D <0x103>; wakeup-source; }; =20 - SW7 { + switch-7 { label =3D "SW7"; gpios =3D <&pioA PIN_PA26 GPIO_ACTIVE_LOW>; linux,code =3D <0x107>; wakeup-source; }; =20 - SW8 { + switch-8 { label =3D "SW8"; gpios =3D <&pioA PIN_PA24 GPIO_ACTIVE_LOW>; linux,code =3D <0x108>; diff --git a/arch/arm/boot/dts/at91-kizboxmini-common.dtsi b/arch/arm/boot/= dts/at91-kizboxmini-common.dtsi index 9c622892c692..8fb08e6fad7a 100644 --- a/arch/arm/boot/dts/at91-kizboxmini-common.dtsi +++ b/arch/arm/boot/dts/at91-kizboxmini-common.dtsi @@ -39,14 +39,14 @@ gpio_keys { #address-cells =3D <1>; #size-cells =3D <0>; =20 - prog { + key-prog { label =3D "PB_PROG"; gpios =3D <&pioC 17 GPIO_ACTIVE_LOW>; linux,code =3D <0x102>; wakeup-source; }; =20 - reset { + key-reset { label =3D "PB_RST"; gpios =3D <&pioC 16 GPIO_ACTIVE_LOW>; linux,code =3D <0x100>; diff --git a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts b/arch/arm/boot/dt= s/at91-nattis-2-natte-2.dts index 4f123477e631..f71377c9b757 100644 --- a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts +++ b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts @@ -18,7 +18,7 @@ / { gpio-keys { compatible =3D "gpio-keys"; =20 - wakeup { + key-wakeup { label =3D "Wakeup"; linux,code =3D <10>; wakeup-source; diff --git a/arch/arm/boot/dts/at91-qil_a9260.dts b/arch/arm/boot/dts/at91-= qil_a9260.dts index 969d990767fc..d09b3d15a828 100644 --- a/arch/arm/boot/dts/at91-qil_a9260.dts +++ b/arch/arm/boot/dts/at91-qil_a9260.dts @@ -201,7 +201,7 @@ gpio_keys { #address-cells =3D <1>; #size-cells =3D <0>; =20 - user_pb { + button-user { label =3D "user_pb"; gpios =3D <&pioB 10 GPIO_ACTIVE_LOW>; linux,code =3D <28>; diff --git a/arch/arm/boot/dts/at91-sam9x60ek.dts b/arch/arm/boot/dts/at91-= sam9x60ek.dts index 7719ea3d4933..7bf99bdbafcf 100644 --- a/arch/arm/boot/dts/at91-sam9x60ek.dts +++ b/arch/arm/boot/dts/at91-sam9x60ek.dts @@ -76,13 +76,13 @@ vdd2_3v3: regulator-fixed-vdd2_3v3@3 { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_key_gpio_default>; status =3D "okay"; =20 - sw1 { + switch-1 { label =3D "SW1"; gpios =3D <&pioD 18 GPIO_ACTIVE_LOW>; linux,code=3D; diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dt= s/at91-sama5d27_som1_ek.dts index 08f0d4b995ff..96c9290007a8 100644 --- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts +++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts @@ -478,13 +478,13 @@ can1: can@fc050000 { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_key_gpio_default>; =20 - pb4 { + button { label =3D "USER"; gpios =3D <&pioA PIN_PA29 GPIO_ACTIVE_LOW>; linux,code =3D ; diff --git a/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts b/arch/arm/boot/= dts/at91-sama5d27_wlsom1_ek.dts index 5e8755f22784..d5652c974748 100644 --- a/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts +++ b/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts @@ -26,14 +26,14 @@ chosen { stdout-path =3D "serial0:115200n8"; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_key_gpio_default>; status =3D "okay"; =20 - sw4 { + switch-4 { label =3D "USER BUTTON"; gpios =3D <&pioA PIN_PB2 GPIO_ACTIVE_LOW>; linux,code =3D ; diff --git a/arch/arm/boot/dts/at91-sama5d2_icp.dts b/arch/arm/boot/dts/at9= 1-sama5d2_icp.dts index 806eb1d911d7..d7b59e16a081 100644 --- a/arch/arm/boot/dts/at91-sama5d2_icp.dts +++ b/arch/arm/boot/dts/at91-sama5d2_icp.dts @@ -42,14 +42,14 @@ main_xtal { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_key_gpio_default>; status =3D "okay"; =20 - sw4 { + switch-4 { label =3D "USER_PB1"; gpios =3D <&pioA PIN_PD0 GPIO_ACTIVE_LOW>; linux,code =3D ; diff --git a/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts b/arch/arm/boot/dts/= at91-sama5d2_ptc_ek.dts index 8ed58af01391..544c64549459 100644 --- a/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts +++ b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts @@ -394,13 +394,13 @@ pinctrl_usba_vbus: usba_vbus { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_key_gpio_default>; =20 - bp1 { + button-1 { label =3D "PB_USER"; gpios =3D <&pioA PIN_PA10 GPIO_ACTIVE_LOW>; linux,code =3D ; diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dt= s/at91-sama5d2_xplained.dts index cdfe891f9a9e..6799c2f475b2 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -703,13 +703,13 @@ can1: can@fc050000 { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_key_gpio_default>; =20 - bp1 { + button { label =3D "PB_USER"; gpios =3D <&pioA PIN_PB9 GPIO_ACTIVE_LOW>; linux,code =3D ; diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dt= s/at91-sama5d3_xplained.dts index a49c2966b41e..1f42a6a981bf 100644 --- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts @@ -372,13 +372,13 @@ vcc_mmc0_reg: fixedregulator_mmc0 { regulator-always-on; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_key_gpio>; =20 - bp3 { + button { label =3D "PB_USER"; gpios =3D <&pioE 29 GPIO_ACTIVE_LOW>; linux,code =3D ; diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dt= s/at91-sama5d4_xplained.dts index e519d2747936..f122f302f8e0 100644 --- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts @@ -242,13 +242,13 @@ rootfs@800000 { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_key_gpio>; =20 - pb_user1 { + button { label =3D "pb_user1"; gpios =3D <&pioE 8 GPIO_ACTIVE_HIGH>; linux,code =3D ; diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-= sama5d4ek.dts index 7017f626f362..fce4e93c6bee 100644 --- a/arch/arm/boot/dts/at91-sama5d4ek.dts +++ b/arch/arm/boot/dts/at91-sama5d4ek.dts @@ -269,13 +269,13 @@ rootfs@800000 { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_key_gpio>; =20 - pb_user1 { + button { label =3D "pb_user1"; gpios =3D <&pioE 13 GPIO_ACTIVE_HIGH>; linux,code =3D <0x100>; diff --git a/arch/arm/boot/dts/at91-sama7g5ek.dts b/arch/arm/boot/dts/at91-= sama7g5ek.dts index 103544620fd7..de44da2e4aae 100644 --- a/arch/arm/boot/dts/at91-sama7g5ek.dts +++ b/arch/arm/boot/dts/at91-sama7g5ek.dts @@ -45,13 +45,13 @@ main_xtal { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_key_gpio_default>; =20 - bp1 { + button { label =3D "PB_USER"; gpios =3D <&pioA PIN_PA12 GPIO_ACTIVE_LOW>; linux,code =3D ; diff --git a/arch/arm/boot/dts/at91-wb45n.dts b/arch/arm/boot/dts/at91-wb45= n.dts index 54d130c92185..3e46b29412d1 100644 --- a/arch/arm/boot/dts/at91-wb45n.dts +++ b/arch/arm/boot/dts/at91-wb45n.dts @@ -12,7 +12,7 @@ / { model =3D "Laird Workgroup Bridge 45N - Atmel AT91SAM (dt)"; compatible =3D "laird,wb45n", "laird,wbxx", "atmel,at91sam9x5", "atmel,at= 91sam9"; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; #address-cells =3D <1>; #size-cells =3D <0>; diff --git a/arch/arm/boot/dts/at91-wb50n.dts b/arch/arm/boot/dts/at91-wb50= n.dts index 89f0f717f7ed..e2195bd3e4b4 100644 --- a/arch/arm/boot/dts/at91-wb50n.dts +++ b/arch/arm/boot/dts/at91-wb50n.dts @@ -13,7 +13,7 @@ / { model =3D "Laird Workgroup Bridge 50N - Atmel SAMA5D"; compatible =3D "laird,wb50n", "atmel,sama5d31", "atmel,sama5d3", "atmel,s= ama5"; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; #address-cells =3D <1>; #size-cells =3D <0>; diff --git a/arch/arm/boot/dts/at91sam9260ek.dts b/arch/arm/boot/dts/at91sa= m9260ek.dts index 6381088ba24f..bb72f050a4fe 100644 --- a/arch/arm/boot/dts/at91sam9260ek.dts +++ b/arch/arm/boot/dts/at91sam9260ek.dts @@ -144,17 +144,17 @@ nand0: nand@40000000 { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - btn3 { + button-3 { label =3D "Button 3"; gpios =3D <&pioA 30 GPIO_ACTIVE_LOW>; linux,code =3D <0x103>; wakeup-source; }; =20 - btn4 { + button-4 { label =3D "Button 4"; gpios =3D <&pioA 31 GPIO_ACTIVE_LOW>; linux,code =3D ; diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sa= m9261ek.dts index 6fb4fe49cf1c..88869ca874d1 100644 --- a/arch/arm/boot/dts/at91sam9261ek.dts +++ b/arch/arm/boot/dts/at91sam9261ek.dts @@ -211,31 +211,31 @@ ds1 { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - button_0 { + button-0 { label =3D "button_0"; gpios =3D <&pioA 27 GPIO_ACTIVE_LOW>; linux,code =3D <256>; wakeup-source; }; =20 - button_1 { + button-1 { label =3D "button_1"; gpios =3D <&pioA 26 GPIO_ACTIVE_LOW>; linux,code =3D <257>; wakeup-source; }; =20 - button_2 { + button-2 { label =3D "button_2"; gpios =3D <&pioA 25 GPIO_ACTIVE_LOW>; linux,code =3D <258>; wakeup-source; }; =20 - button_3 { + button-3 { label =3D "button_3"; gpios =3D <&pioA 24 GPIO_ACTIVE_LOW>; linux,code =3D <259>; diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sa= m9263ek.dts index e732565913a4..ce8baff6a9f4 100644 --- a/arch/arm/boot/dts/at91sam9263ek.dts +++ b/arch/arm/boot/dts/at91sam9263ek.dts @@ -232,17 +232,17 @@ d2 { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - left_click { + button-left-click { label =3D "left_click"; gpios =3D <&pioC 5 GPIO_ACTIVE_LOW>; linux,code =3D <272>; wakeup-source; }; =20 - right_click { + button-right-click { label =3D "right_click"; gpios =3D <&pioC 4 GPIO_ACTIVE_LOW>; linux,code =3D <273>; diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dt= s/at91sam9g20ek_common.dtsi index 85c17dd1c8d5..60d61291f344 100644 --- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi @@ -234,17 +234,17 @@ wm8731: wm8731@1b { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - btn3 { + button-3 { label =3D "Button 3"; gpios =3D <&pioA 30 GPIO_ACTIVE_LOW>; linux,code =3D <0x103>; wakeup-source; }; =20 - btn4 { + button-4 { label =3D "Button 4"; gpios =3D <&pioA 31 GPIO_ACTIVE_LOW>; linux,code =3D ; diff --git a/arch/arm/boot/dts/at91sam9g25-gardena-smart-gateway.dts b/arch= /arm/boot/dts/at91sam9g25-gardena-smart-gateway.dts index 7da70aeeb528..92f2c05c873f 100644 --- a/arch/arm/boot/dts/at91sam9g25-gardena-smart-gateway.dts +++ b/arch/arm/boot/dts/at91sam9g25-gardena-smart-gateway.dts @@ -23,7 +23,7 @@ aliases { gpio-keys { compatible =3D "gpio-keys"; =20 - user_btn1 { + button { label =3D "USER_BTN1"; gpios =3D <&pioA 24 GPIO_ACTIVE_LOW>; linux,code =3D ; diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at9= 1sam9m10g45ek.dts index e5db198a87a8..7f45e81ca165 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -343,48 +343,48 @@ led-3 { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - left_click { + button-left-click { label =3D "left_click"; gpios =3D <&pioB 6 GPIO_ACTIVE_LOW>; linux,code =3D <272>; wakeup-source; }; =20 - right_click { + button-right-click { label =3D "right_click"; gpios =3D <&pioB 7 GPIO_ACTIVE_LOW>; linux,code =3D <273>; wakeup-source; }; =20 - left { + button-left { label =3D "Joystick Left"; gpios =3D <&pioB 14 GPIO_ACTIVE_LOW>; linux,code =3D <105>; }; =20 - right { + button-right { label =3D "Joystick Right"; gpios =3D <&pioB 15 GPIO_ACTIVE_LOW>; linux,code =3D <106>; }; =20 - up { + button-up { label =3D "Joystick Up"; gpios =3D <&pioB 16 GPIO_ACTIVE_LOW>; linux,code =3D <103>; }; =20 - down { + button-down { label =3D "Joystick Down"; gpios =3D <&pioB 17 GPIO_ACTIVE_LOW>; linux,code =3D <108>; }; =20 - enter { + button-enter { label =3D "Joystick Press"; gpios =3D <&pioB 18 GPIO_ACTIVE_LOW>; linux,code =3D <28>; diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sa= m9n12ek.dts index c905d7bfc771..4c644d4c6be7 100644 --- a/arch/arm/boot/dts/at91sam9n12ek.dts +++ b/arch/arm/boot/dts/at91sam9n12ek.dts @@ -226,10 +226,10 @@ d10 { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - enter { + button-enter { label =3D "Enter"; gpios =3D <&pioB 3 GPIO_ACTIVE_LOW>; linux,code =3D <28>; diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam= 9rlek.dts index ddaadfec6751..a57351270551 100644 --- a/arch/arm/boot/dts/at91sam9rlek.dts +++ b/arch/arm/boot/dts/at91sam9rlek.dts @@ -248,17 +248,17 @@ led-3 { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - right_click { + button-right-click { label =3D "right_click"; gpios =3D <&pioB 0 GPIO_ACTIVE_LOW>; linux,code =3D <273>; wakeup-source; }; =20 - left_click { + button-left-click { label =3D "left_click"; gpios =3D <&pioB 1 GPIO_ACTIVE_LOW>; linux,code =3D <272>; --=20 2.34.1