From nobody Sun Sep 22 01:53:22 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 ECC50C43334 for ; Thu, 16 Jun 2022 00:55:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350086AbiFPAzp (ORCPT ); Wed, 15 Jun 2022 20:55:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350883AbiFPAy7 (ORCPT ); Wed, 15 Jun 2022 20:54:59 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04404580EF for ; Wed, 15 Jun 2022 17:54:33 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id 73-20020a17090a0fcf00b001eaee69f600so118919pjz.1 for ; Wed, 15 Jun 2022 17:54:33 -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=H9UaV1sYZIIEFZGVRGlOf8TGBu1P1hS1TkTEk2+ru+4=; b=tXWDHOTshK3ZvSEO/QH+hzsm1OU4HunqWlYHKsRkCEa+zeOlCxCGW+OVxeKzuVfUdG U902w8zmMtF8n7IawKlBAqh11YnJPVI2cVJxDz08sdKzDzeDeILrBKKXOeP6imlw2bat AKRqFl9P3+4Jhgdj2Z1n47d1qCe+EmL3PHK9xlHseIOC8sOkaSwi8xp7H1G95satKI5W MzHomOvAn1+7Cy9CzVmz1JfG0pOC6wsRNPFNbBEYCNXa9qGsrgOhbMn4W6Qq46NZvc5j v3VJacZ7Ie7XDXBiA5gEfaTIhMB+hS0LXChuhfMWCvGzAOgR9FvRMW9jxCRtbRDVUp+k cukQ== 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=H9UaV1sYZIIEFZGVRGlOf8TGBu1P1hS1TkTEk2+ru+4=; b=sOARJdmkvytsOfzvK+EPNNIayU04DEQtpjy5Ml0jAgeV3NgZdqh6z2dV97jZyhmgG6 0E1FaQLrhyG3LQlVh5Cz5a9mshWbVYHzvjP58bkcJUTBlkt9F6Vz5Azqpss5C+ZzljqL 0vdOwqGSFMTQ6+Orxae1ikUzCqQsEL5QuRZFvor1Iuro6lJqHSWp7bvw0tNkIEor2gf/ A7b80zoe09031VIfjYCYACrGmav5g80lA9L9I7B8f0gMOHvkhVi6XZLNCQOCzrhfDW7w tG3rdVLP2TvjkeJVm0F8rahereOhoSfHJiKO199yzClExdS7kqmrCcOhRt/BkxGbRFJB b9DA== X-Gm-Message-State: AJIora+fw6Zy/26FLyKOCl5LfqfeZBZOmuqnUA3Yu3F4UYdFs8xOzUyx Lh/RTc/Sx1UkpMqi1pUSwe19sA== X-Google-Smtp-Source: AGRyM1tDRWvOPoXGaxd6yySH2Ituh+oc0RH1upOt/9o6cEmXxjnSJUR7CRc7UmKQ83ju/QXA73mI8g== X-Received: by 2002:a17:903:2645:b0:167:92f1:15c0 with SMTP id je5-20020a170903264500b0016792f115c0mr2173940plb.100.1655340873576; Wed, 15 Jun 2022 17:54:33 -0700 (PDT) Received: from krzk-bin.. ([192.77.111.2]) by smtp.gmail.com with ESMTPSA id p4-20020a170902780400b0016760c06b76sm233660pll.194.2022.06.15.17.54.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 17:54:33 -0700 (PDT) From: Krzysztof Kozlowski To: arm@kernel.org, soc@kernel.org, Arnd Bergmann , Olof Johansson , Rob Herring , Krzysztof Kozlowski , Heiko Stuebner , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v3 26/40] arm64: dts: rockchip: align gpio-key node names with dtschema Date: Wed, 15 Jun 2022 17:53:19 -0700 Message-Id: <20220616005333.18491-26-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220616005224.18391-1-krzysztof.kozlowski@linaro.org> References: <20220616005224.18391-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 --- Changes since v2: 1. rk3308-evb.dts, rk3326-odroid-go2.dts: different names according to discussion. --- 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..9fe9b0d11003 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 =3D "default"; pinctrl-0 =3D <&pwr_key>; =20 - power { + key-power { gpios =3D <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>; linux,code =3D ; label =3D "GPIO Key Power"; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts b/arch/arm6= 4/boot/dts/rockchip/rk3326-odroid-go2.dts index ea0695b51ecd..415aa9ff8bd4 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 { * |------------------------------------------------| */ =20 - sw1 { + button-sw1 { gpios =3D <&gpio1 RK_PB4 GPIO_ACTIVE_LOW>; label =3D "DPAD-UP"; linux,code =3D ; }; - sw2 { + button-sw2 { gpios =3D <&gpio1 RK_PB5 GPIO_ACTIVE_LOW>; label =3D "DPAD-DOWN"; linux,code =3D ; }; - sw3 { + button-sw3 { gpios =3D <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>; label =3D "DPAD-LEFT"; linux,code =3D ; }; - sw4 { + button-sw4 { gpios =3D <&gpio1 RK_PB7 GPIO_ACTIVE_LOW>; label =3D "DPAD-RIGHT"; linux,code =3D ; }; - sw5 { + button-sw5 { gpios =3D <&gpio1 RK_PA2 GPIO_ACTIVE_LOW>; label =3D "BTN-A"; linux,code =3D ; }; - sw6 { + button-sw6 { gpios =3D <&gpio1 RK_PA5 GPIO_ACTIVE_LOW>; label =3D "BTN-B"; linux,code =3D ; }; - sw7 { + button-sw7 { gpios =3D <&gpio1 RK_PA6 GPIO_ACTIVE_LOW>; label =3D "BTN-Y"; linux,code =3D ; }; - sw8 { + button-sw8 { gpios =3D <&gpio1 RK_PA7 GPIO_ACTIVE_LOW>; label =3D "BTN-X"; linux,code =3D ; }; - sw9 { + button-sw9 { gpios =3D <&gpio2 RK_PA0 GPIO_ACTIVE_LOW>; label =3D "F1"; linux,code =3D ; }; - sw10 { + button-sw10 { gpios =3D <&gpio2 RK_PA1 GPIO_ACTIVE_LOW>; label =3D "F2"; linux,code =3D ; }; - sw11 { + button-sw11 { gpios =3D <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>; label =3D "F3"; linux,code =3D ; }; - sw12 { + button-sw12 { gpios =3D <&gpio2 RK_PA3 GPIO_ACTIVE_LOW>; label =3D "F4"; linux,code =3D ; }; - sw13 { + button-sw13 { gpios =3D <&gpio2 RK_PA4 GPIO_ACTIVE_LOW>; label =3D "F5"; linux,code =3D ; }; - sw14 { + button-sw14 { gpios =3D <&gpio2 RK_PA5 GPIO_ACTIVE_LOW>; label =3D "F6"; linux,code =3D ; }; - sw15 { + button-sw15 { gpios =3D <&gpio2 RK_PA6 GPIO_ACTIVE_LOW>; label =3D "TOP-LEFT"; linux,code =3D ; }; - sw16 { + button-sw16 { gpios =3D <&gpio2 RK_PA7 GPIO_ACTIVE_LOW>; label =3D "TOP-RIGHT"; linux,code =3D ; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm6= 4/boot/dts/rockchip/rk3328-nanopi-r2s.dts index 3857d487ab84..1445b879ac7a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts @@ -34,7 +34,7 @@ keys { pinctrl-0 =3D <&reset_button_pin>; pinctrl-names =3D "default"; =20 - reset { + key-reset { label =3D "reset"; gpios =3D <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>; linux,code =3D ; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot= /dts/rockchip/rk3368-evb.dtsi index 15d1fc541c38..083452c67711 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi @@ -76,7 +76,7 @@ keys: gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&pwr_key>; =20 - power { + key-power { wakeup-source; gpios =3D <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; label =3D "GPIO Power"; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts b/arch/arm64/b= oot/dts/rockchip/rk3368-geekbox.dts index 62aa97a0b8c9..be06e6e64d18 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts @@ -43,7 +43,7 @@ keys: gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&pwr_key>; =20 - power { + key-power { gpios =3D <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; label =3D "GPIO Power"; linux,code =3D ; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts b/arch/= arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts index 05c50e584e2e..7f5bba0c6001 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts @@ -44,7 +44,7 @@ keys: gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&pwr_key>; =20 - power { + key-power { wakeup-source; gpios =3D <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; label =3D "GPIO Power"; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts b/arch/arm64/b= oot/dts/rockchip/rk3368-px5-evb.dts index 5ccaa5f7a370..29df84b81552 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts @@ -30,7 +30,7 @@ keys: gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&pwr_key>; =20 - power { + key-power { gpios =3D <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; label =3D "GPIO Power"; linux,code =3D ; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/= dts/rockchip/rk3368-r88.dts index 959d3cc801f2..38d757c00548 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts @@ -37,7 +37,7 @@ keys: gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&pwr_key>; =20 - power { + key-power { wakeup-source; gpios =3D <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; label =3D "GPIO Power"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/b= oot/dts/rockchip/rk3399-firefly.dts index b340c9e246c4..c5db64f3e124 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts @@ -87,7 +87,7 @@ gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&pwrbtn>; =20 - power { + key-power { debounce-interval =3D <100>; gpios =3D <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; label =3D "GPIO Key Power"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch= /arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi index 50d459ee4831..cd074641884b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi @@ -206,7 +206,7 @@ gpio_keys: gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&bt_host_wake_l>; =20 - wake_on_bt: wake-on-bt { + wake_on_bt: key-wake-on-bt { label =3D "Wake-on-Bluetooth"; gpios =3D <&gpio0 3 GPIO_ACTIVE_LOW>; linux,code =3D ; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts b/arch/arm64= /boot/dts/rockchip/rk3399-gru-kevin.dts index 6863689df06f..2cc9b3386c16 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts @@ -92,7 +92,7 @@ &gpio_keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&bt_host_wake_l>, <&cpu1_pen_eject>; =20 - pen-insert { + switch-pen-insert { label =3D "Pen Insert"; /* Insert =3D low, eject =3D high */ gpios =3D <&gpio0 13 GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/ar= m64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi index 1977103a5ef4..40d4053fba80 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi @@ -183,7 +183,7 @@ gpio_keys: gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&pen_eject_odl>; =20 - pen-insert { + switch-pen-insert { label =3D "Pen Insert"; /* Insert =3D low, eject =3D high */ gpios =3D <&gpio1 1 GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi b/arch/ar= m64/boot/dts/rockchip/rk3399-khadas-edge.dtsi index 46c4581deb8d..2a332763c35c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi @@ -136,7 +136,7 @@ gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&pwrbtn>; =20 - power { + key-power { debounce-interval =3D <100>; gpios =3D <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; label =3D "GPIO Key Power"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm6= 4/boot/dts/rockchip/rk3399-nanopi-r4s.dts index cef4d18b599d..fe5b52610010 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts @@ -46,9 +46,9 @@ wan_led: led-wan { gpio-keys { pinctrl-0 =3D <&reset_button_pin>; =20 - /delete-node/ power; + /delete-node/ key-power; =20 - reset { + key-reset { debounce-interval =3D <50>; gpios =3D <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; label =3D "reset"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/= boot/dts/rockchip/rk3399-nanopi4.dtsi index 248ad41a976b..278123b4f911 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi @@ -111,7 +111,7 @@ gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&power_key>; =20 - power { + key-power { debounce-interval =3D <100>; gpios =3D <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; label =3D "GPIO Key Power"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts b/arch/arm64/= boot/dts/rockchip/rk3399-orangepi.dts index ed856bfcfc33..9e2e246e0bab 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts @@ -78,7 +78,7 @@ keys: gpio-keys { compatible =3D "gpio-keys"; autorepeat; =20 - power { + key-power { debounce-interval =3D <100>; gpios =3D <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; label =3D "GPIO Power"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/ar= m64/boot/dts/rockchip/rk3399-pinebook-pro.dts index d6b68d77d63a..194e48c755f6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts @@ -76,7 +76,7 @@ gpio-key-lid { pinctrl-names =3D "default"; pinctrl-0 =3D <&lidbtn_pin>; =20 - lid { + switch-lid { debounce-interval =3D <20>; gpios =3D <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>; label =3D "Lid"; @@ -92,7 +92,7 @@ gpio-key-power { pinctrl-names =3D "default"; pinctrl-0 =3D <&pwrbtn_pin>; =20 - power { + key-power { debounce-interval =3D <20>; gpios =3D <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; label =3D "Power"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/b= oot/dts/rockchip/rk3399-roc-pc.dtsi index 0e45cc2d195b..acb174d3a8c5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi @@ -54,7 +54,7 @@ gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&pwr_key_l>; =20 - power { + key-power { debounce-interval =3D <100>; gpios =3D <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; label =3D "GPIO Key Power"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm6= 4/boot/dts/rockchip/rk3399-rockpro64.dtsi index 6fdeee7d5f6d..78157521e944 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi @@ -42,7 +42,7 @@ gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&pwrbtn>; =20 - power { + key-power { debounce-interval =3D <100>; gpios =3D <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; label =3D "GPIO Key Power"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64= /boot/dts/rockchip/rk3399-sapphire.dtsi index 2aa0fad8f893..e6ac292ce645 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -53,7 +53,7 @@ keys: gpio-keys { compatible =3D "gpio-keys"; autorepeat; =20 - power { + key-power { debounce-interval =3D <100>; gpios =3D <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; label =3D "GPIO Power"; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi b/arch/arm64= /boot/dts/rockchip/rk3566-pinenote.dtsi index e01668e6e5f9..ea0fa627c464 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi @@ -49,7 +49,7 @@ gpio-keys { pinctrl-0 =3D <&hall_int_l>; pinctrl-names =3D "default"; =20 - cover { + switch { label =3D "cover"; gpios =3D <&gpio0 RK_PC7 GPIO_ACTIVE_LOW>; linux,input-type =3D ; --=20 2.34.1