From nobody Sun Sep 22 02:06:00 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 9CD1ACCA47E for ; Thu, 16 Jun 2022 00:54:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350553AbiFPAyx (ORCPT ); Wed, 15 Jun 2022 20:54:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349840AbiFPAy2 (ORCPT ); Wed, 15 Jun 2022 20:54:28 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C47157994 for ; Wed, 15 Jun 2022 17:54:16 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id w21so138162pfc.0 for ; Wed, 15 Jun 2022 17:54:16 -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=hsW59cFZjklHB2Wpxrfsfror1DmvkvVRBrL7nFD90Rw=; b=gT7gqFzbN8epGJaDV1iKFM6cTxx7kd3KDK95NFIR6vxJr/e/IBbTs4Wztt6Gf8e9nD 5sVU/Dk9DyC18wj3nLZp1lVtPcj0NC0BybAhCNtTB10PZg5ho9Q3jIheRedswqqM3vvw YEo+K7qmtxwnfAUZCHk7II4CLLTQ2lCbPTrOb2+9ZL31uPpaPn4LqjklKkDjrJWpmeN2 f3yfH3Lu2WPIFiWiAlX355Jt0GRcBNpbmXKttGoO+H66Wwl+NusPKjIn30Zxsfuly9Xz 1IhilHqF2ZDGOOyII59iTkLsR02JRWRcEwZF99vHIfqhxibqdQnk+hOfsDswuc8FR5eD 4wOQ== 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=hsW59cFZjklHB2Wpxrfsfror1DmvkvVRBrL7nFD90Rw=; b=1XyKGwACC+GKwArm3I71JRH/09pKrExgbSu1ho3tdX5U36zWoWVNz5q20OGd/TkAff JYqQYUFkmvtLWpWDdyDZAId03IiGK3KskSXTUeafQihJTCoooiNr1hufxRiWDLyq0hV4 FzpPYvu5dLoRYd88IQNo+LrVrFTG44EcYu+RkTcu0nkpjVcw9aVnlKFNUEMrRMDXktav HwPNyQaIWcbHAvwHJ/0uWfaE+6Sp4+voitB5gVBsl+Nbp/UufgPPpmNhIfztgWKrsxrB u69o2M1587vvqmEDJhDXwhMK7lPzuVue22F+YA95yaw0jNyaGZs0LdWZnXSiZcTyJQPb G2kQ== X-Gm-Message-State: AJIora+s5KZWTOnEmwrXi0NCoDgYLz9hcpXzQQQh7yhRQTuc3boGJhP6 zDTf0/C64qRSq77EQqkvUovwWA== X-Google-Smtp-Source: AGRyM1v9PXc3M6qtFJkIuJ5CZkLsvfE0UjONQMjhaOvEr+7WUGSHaubkM2UtRha1WHx8hBYamDVZtg== X-Received: by 2002:a63:441f:0:b0:3fc:8bd2:f828 with SMTP id r31-20020a63441f000000b003fc8bd2f828mr2096272pga.579.1655340855648; Wed, 15 Jun 2022 17:54:15 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 17:54:15 -0700 (PDT) From: Krzysztof Kozlowski To: arm@kernel.org, soc@kernel.org, Arnd Bergmann , Olof Johansson , Rob Herring , Krzysztof Kozlowski , Matthias Brugger , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v3 15/40] arm64: dts: mediatek: align gpio-key node names with dtschema Date: Wed, 15 Jun 2022 17:53:08 -0700 Message-Id: <20220616005333.18491-15-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 --- .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 ++-- arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 ++-- arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts | 6 +++--- arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 10 +++++----- arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 4 ++-- arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi | 2 +- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 +- arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts b/arc= h/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts index 2b9bf8dd14ec..c2311733d2de 100644 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts @@ -40,13 +40,13 @@ cpu@1 { gpio-keys { compatible =3D "gpio-keys"; =20 - factory { + factory-key { label =3D "factory"; linux,code =3D ; gpios =3D <&pio 0 GPIO_ACTIVE_HIGH>; }; =20 - wps { + wps-key { label =3D "wps"; linux,code =3D ; gpios =3D <&pio 102 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts b/arch/arm64/boot= /dts/mediatek/mt7622-rfb1.dts index 596c073d8b05..c28da9323a9c 100644 --- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts @@ -42,13 +42,13 @@ gpio-keys { compatible =3D "gpio-keys"; poll-interval =3D <100>; =20 - factory { + key-factory { label =3D "factory"; linux,code =3D ; gpios =3D <&pio 0 0>; }; =20 - wps { + key-wps { label =3D "wps"; linux,code =3D ; gpios =3D <&pio 102 0>; diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts b/arch/a= rm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts index 44f6149c1307..28433b94f7c7 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts @@ -21,7 +21,7 @@ cpu_crit: cpu_crit0 { }; =20 &gpio_keys { - /delete-node/tablet_mode; - /delete-node/volume_down; - /delete-node/volume_up; + /delete-node/switch-tablet-mode; + /delete-node/switch-volume-down; + /delete-node/switch-volume-up; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot= /dts/mediatek/mt8173-elm.dtsi index 9c75fbb31f98..d20378758213 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi @@ -53,7 +53,7 @@ gpio_keys: gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_keys_pins>; =20 - lid { + switch-lid { label =3D "Lid"; gpios =3D <&pio 69 GPIO_ACTIVE_LOW>; linux,code =3D ; @@ -61,7 +61,7 @@ lid { gpio-key,wakeup; }; =20 - power { + switch-power { label =3D "Power"; gpios =3D <&pio 14 GPIO_ACTIVE_HIGH>; linux,code =3D ; @@ -69,7 +69,7 @@ power { gpio-key,wakeup; }; =20 - tablet_mode { + switch-tablet-mode { label =3D "Tablet_mode"; gpios =3D <&pio 121 GPIO_ACTIVE_HIGH>; linux,code =3D ; @@ -77,13 +77,13 @@ tablet_mode { gpio-key,wakeup; }; =20 - volume_down { + switch-volume-down { label =3D "Volume_down"; gpios =3D <&pio 123 GPIO_ACTIVE_LOW>; linux,code =3D ; }; =20 - volume_up { + switch-volume-up { label =3D "Volume_up"; gpios =3D <&pio 124 GPIO_ACTIVE_LOW>; linux,code =3D ; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi b/arch/= arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi index 2d7a193272ae..3ac83be53627 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi @@ -73,7 +73,7 @@ volume_buttons: volume-buttons { pinctrl-names =3D "default"; pinctrl-0 =3D <&volume_button_pins>; =20 - volume_down { + button-volume-down { label =3D "Volume Down"; linux,code =3D ; debounce-interval =3D <100>; @@ -81,7 +81,7 @@ volume_down { gpios =3D <&pio 6 GPIO_ACTIVE_LOW>; }; =20 - volume_up { + button-volume-up { label =3D "Volume Up"; linux,code =3D ; debounce-interval =3D <100>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi b/arch/a= rm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi index 28966a65391b..50a0dd36b5fb 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi @@ -45,7 +45,7 @@ gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&pen_eject>; =20 - pen-insert { + switch-pen-insert { label =3D "Pen Insert"; /* Insert =3D low, eject =3D high */ gpios =3D <&pio 6 GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/bo= ot/dts/mediatek/mt8183-kukui.dtsi index b035e06840e6..b50261e8b9ed 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi @@ -144,7 +144,7 @@ wifi_wakeup: wifi-wakeup { pinctrl-names =3D "default"; pinctrl-0 =3D <&wifi_pins_wakeup>; =20 - wowlan { + button-wowlan { label =3D "Wake on WiFi"; gpios =3D <&pio 113 GPIO_ACTIVE_HIGH>; linux,code =3D ; diff --git a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi b/arch/arm64/= boot/dts/mediatek/pumpkin-common.dtsi index 7a717f926929..8ee1529683a3 100644 --- a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi +++ b/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi @@ -28,7 +28,7 @@ gpio-keys { pinctrl-names =3D "default"; pinctrl-0 =3D <&gpio_keys_default>; =20 - volume-up { + key-volume-up { gpios =3D <&pio 42 GPIO_ACTIVE_LOW>; label =3D "volume_up"; linux,code =3D <115>; @@ -36,7 +36,7 @@ volume-up { debounce-interval =3D <15>; }; =20 - volume-down { + key-volume-down { gpios =3D <&pio 43 GPIO_ACTIVE_LOW>; label =3D "volume_down"; linux,code =3D <114>; --=20 2.34.1