From nobody Sun Sep 22 01:45:31 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 4E648CCA47B for ; Thu, 9 Jun 2022 11:39:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242425AbiFILjr (ORCPT ); Thu, 9 Jun 2022 07:39:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242223AbiFILjb (ORCPT ); Thu, 9 Jun 2022 07:39:31 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 560421A4A1A for ; Thu, 9 Jun 2022 04:39:29 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id 25so30535041edw.8 for ; Thu, 09 Jun 2022 04:39:29 -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=qUF7mJgyuOeQm7yqPJz+0uBUgSwvVQUVFwelZsrvov4=; b=NfadNQ/aFI7ofL8KwsplXAbQ0IPQd2DFyEVUrjhsA9GQfZK6w/oUk+3P1MwvQXGMG7 bIHvscTaV2Nm6AMfDzRwZo72/bsAT+H0lsqff2N83hg2YACYFhNQEVDe0pkLF/+6QjSU mEH2gUVulT7Rv5LqWWXoPsYdcx0kY16/dq4J8kOV2KTJA7wPGAIaqY9+7ROuv5AY1Wsj jQE82QLEwmBfUmIMoppyE/UfN0jsCeckfzfXCdyz0ruxvLkQq1epCliJfeegz89RKSgg OVtd4ku/IsQQPeXL6uKjBtAcl+Nlzu8hHeRFCkdvycnSedrsQua1t8Yp9GZNQcj1iOHz bv8w== 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=qUF7mJgyuOeQm7yqPJz+0uBUgSwvVQUVFwelZsrvov4=; b=S/3yOumXWoWOJ32XHhhjfZuSvabNzKH3YydAlfX29cQZaAxheTbx3VppQCH+nMS62x 4HuRekjCMTMWYIUT2i12YXqo4+tMOSF8hLjyWkZreZZbaOO6YZlszXiG9fC17bxY4Kzz a1Ak/4jFBxkJVYDHef0W5pLpmxSPy7Mv20ChnDnFbo1GR4lwZG5WvZqkI4zHaa5yuY08 2SGTfRxN5mb+IZs1kwWN94Soe5KCDioDNjwbZsHA1etY+OvJ96GBF1NTqe+xed2Kxt5z ws6rFHajkfp3R3tIFtyy7dfUKq89KwKVmi1qwkn4kSiWB4Zu9HGhJeY93yBnuNoJ50Hm 25tQ== X-Gm-Message-State: AOAM533NhK3Yo0kWueGm7xWEC/F6g5t20smvSrKqayk/vz5N/hdB9D8V 8+GYW5k4Xqqk7h3yR3Pm4yV9FZLB8tnN4Q== X-Google-Smtp-Source: ABdhPJySnk1BDvd+UM+Ls8V8oJAH25W7D+a4xvsv+LPQaccuAQ/WgwM0D3Z5KNt/NbVt7CUYm6lDkA== X-Received: by 2002:a05:6402:2381:b0:42d:c8fe:d7fe with SMTP id j1-20020a056402238100b0042dc8fed7femr43984477eda.248.1654774767620; Thu, 09 Jun 2022 04:39:27 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id u14-20020aa7d54e000000b0042e21f8c412sm11898495edr.42.2022.06.09.04.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 04:39:27 -0700 (PDT) From: Krzysztof Kozlowski To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Rob Herring , Krzysztof Kozlowski , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 06/48] ARM: dts: allwinner: align gpio-key node names with dtschema Date: Thu, 9 Jun 2022 13:39:08 +0200 Message-Id: <20220609113911.380368-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 Acked-by: Jernej Skrabec --- arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 40 +++++++++---------- arch/arm/boot/dts/sun4i-a10-pcduino.dts | 6 +-- arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 6 +-- .../dts/sun8i-h2-plus-bananapi-m2-zero.dts | 4 +- arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 4 +- .../boot/dts/sun8i-h3-mapleboard-mp130.dts | 6 +-- arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 4 +- arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 4 +- arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 6 +-- arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 4 +- arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 4 +- arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 4 +- arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 4 +- .../boot/dts/sunxi-libretech-all-h3-cc.dtsi | 4 +- 14 files changed, 50 insertions(+), 50 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/d= ts/sun4i-a10-inet9f-rev03.dts index 0a562b2cc5bc..62e7aa587f89 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts @@ -63,7 +63,7 @@ gpio-keys { compatible =3D "gpio-keys-polled"; poll-interval =3D <20>; =20 - left-joystick-left { + event-left-joystick-left { label =3D "Left Joystick Left"; linux,code =3D ; linux,input-type =3D ; @@ -71,7 +71,7 @@ left-joystick-left { gpios =3D <&pio 0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA6 */ }; =20 - left-joystick-right { + event-left-joystick-right { label =3D "Left Joystick Right"; linux,code =3D ; linux,input-type =3D ; @@ -79,7 +79,7 @@ left-joystick-right { gpios =3D <&pio 0 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA5 */ }; =20 - left-joystick-up { + event-left-joystick-up { label =3D "Left Joystick Up"; linux,code =3D ; linux,input-type =3D ; @@ -87,7 +87,7 @@ left-joystick-up { gpios =3D <&pio 0 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA8 */ }; =20 - left-joystick-down { + event-left-joystick-down { label =3D "Left Joystick Down"; linux,code =3D ; linux,input-type =3D ; @@ -95,7 +95,7 @@ left-joystick-down { gpios =3D <&pio 0 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA9 */ }; =20 - right-joystick-left { + event-right-joystick-left { label =3D "Right Joystick Left"; linux,code =3D ; linux,input-type =3D ; @@ -103,7 +103,7 @@ right-joystick-left { gpios =3D <&pio 0 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA1 */ }; =20 - right-joystick-right { + event-right-joystick-right { label =3D "Right Joystick Right"; linux,code =3D ; linux,input-type =3D ; @@ -111,7 +111,7 @@ right-joystick-right { gpios =3D <&pio 0 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA0 */ }; =20 - right-joystick-up { + event-right-joystick-up { label =3D "Right Joystick Up"; linux,code =3D ; linux,input-type =3D ; @@ -119,7 +119,7 @@ right-joystick-up { gpios =3D <&pio 0 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA3 */ }; =20 - right-joystick-down { + event-right-joystick-down { label =3D "Right Joystick Down"; linux,code =3D ; linux,input-type =3D ; @@ -127,7 +127,7 @@ right-joystick-down { gpios =3D <&pio 0 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA4 */ }; =20 - dpad-left { + event-dpad-left { label =3D "DPad Left"; linux,code =3D ; linux,input-type =3D ; @@ -135,7 +135,7 @@ dpad-left { gpios =3D <&pio 7 23 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH23 */ }; =20 - dpad-right { + event-dpad-right { label =3D "DPad Right"; linux,code =3D ; linux,input-type =3D ; @@ -143,7 +143,7 @@ dpad-right { gpios =3D <&pio 7 24 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH24 */ }; =20 - dpad-up { + event-dpad-up { label =3D "DPad Up"; linux,code =3D ; linux,input-type =3D ; @@ -151,7 +151,7 @@ dpad-up { gpios =3D <&pio 7 25 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH25 */ }; =20 - dpad-down { + event-dpad-down { label =3D "DPad Down"; linux,code =3D ; linux,input-type =3D ; @@ -159,49 +159,49 @@ dpad-down { gpios =3D <&pio 7 26 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH26 */ }; =20 - x { + event-x { label =3D "Button X"; linux,code =3D ; gpios =3D <&pio 0 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA16 */ }; =20 - y { + event-y { label =3D "Button Y"; linux,code =3D ; gpios =3D <&pio 0 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA14 */ }; =20 - a { + event-a { label =3D "Button A"; linux,code =3D ; gpios =3D <&pio 0 17 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA17 */ }; =20 - b { + event-b { label =3D "Button B"; linux,code =3D ; gpios =3D <&pio 0 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA15 */ }; =20 - select { + event-select { label =3D "Select Button"; linux,code =3D ; gpios =3D <&pio 0 11 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA11 */ }; =20 - start { + event-start { label =3D "Start Button"; linux,code =3D ; gpios =3D <&pio 0 12 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA12 */ }; =20 - top-left { + event-top-left { label =3D "Top Left Button"; linux,code =3D ; gpios =3D <&pio 7 22 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH22 */ }; =20 - top-right { + event-top-right { label =3D "Top Right Button"; linux,code =3D ; gpios =3D <&pio 0 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA13 */ diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/su= n4i-a10-pcduino.dts index 1ac82376baef..a332d61fd561 100644 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts @@ -77,19 +77,19 @@ led-1 { gpio-keys { compatible =3D "gpio-keys"; =20 - back { + key-back { label =3D "Key Back"; linux,code =3D ; gpios =3D <&pio 7 17 GPIO_ACTIVE_LOW>; }; =20 - home { + key-home { label =3D "Key Home"; linux,code =3D ; gpios =3D <&pio 7 18 GPIO_ACTIVE_LOW>; }; =20 - menu { + key-menu { label =3D "Key Menu"; linux,code =3D ; gpios =3D <&pio 7 19 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/s= un7i-a20-pcduino3.dts index 4f8d55d3ba79..928b86a95f34 100644 --- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts +++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts @@ -78,19 +78,19 @@ led-1 { gpio-keys { compatible =3D "gpio-keys"; =20 - back { + key-back { label =3D "Key Back"; linux,code =3D ; gpios =3D <&pio 7 17 GPIO_ACTIVE_LOW>; }; =20 - home { + key-home { label =3D "Key Home"; linux,code =3D ; gpios =3D <&pio 7 18 GPIO_ACTIVE_LOW>; }; =20 - menu { + key-menu { label =3D "Key Menu"; linux,code =3D ; gpios =3D <&pio 7 19 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts b/arch/ar= m/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts index d5c7b7984d85..335ab583b1cd 100644 --- a/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts +++ b/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts @@ -47,10 +47,10 @@ pwr_led { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - sw4 { + switch-4 { label =3D "power"; linux,code =3D ; gpios =3D <&r_pio 0 3 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/= sun8i-h3-beelink-x2.dts index cd9f655e4f92..8167d473f2fd 100644 --- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts +++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts @@ -93,10 +93,10 @@ led-1 { }; }; =20 - r-gpio-keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - power { + key-power { label =3D "power"; linux,code =3D ; gpios =3D <&r_pio 0 3 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts b/arch/arm/boo= t/dts/sun8i-h3-mapleboard-mp130.dts index ff0a7a952e0c..f5c8ccc5b872 100644 --- a/arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts +++ b/arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts @@ -39,16 +39,16 @@ status_led { }; }; =20 - r_gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - power { + key-power { label =3D "power"; linux,code =3D ; gpios =3D <&r_pio 0 3 GPIO_ACTIVE_LOW>; /* PL3 */ }; =20 - user { + key-user { label =3D "user"; linux,code =3D ; gpios =3D <&r_pio 0 4 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts b/arch/arm/boot/dts= /sun8i-h3-nanopi-duo2.dts index 8e7dfcffe1fb..71d617d25a56 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts @@ -37,10 +37,10 @@ led-1 { }; }; =20 - r_gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - k1 { + key-0 { label =3D "k1"; linux,code =3D ; gpios =3D <&r_pio 0 3 GPIO_ACTIVE_LOW>; /* PL3 */ diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun= 8i-h3-nanopi.dtsi index a9f749f49beb..cf8413fba6c1 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi +++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi @@ -73,10 +73,10 @@ led-1 { }; }; =20 - r_gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - k1 { + key-0 { label =3D "k1"; linux,code =3D ; gpios =3D <&r_pio 0 3 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/= sun8i-h3-orangepi-2.dts index 9daffd90c12f..f1f9dbead32a 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts @@ -88,16 +88,16 @@ pwr_led { }; }; =20 - r_gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - sw2 { + switch-2 { label =3D "sw2"; linux,code =3D ; gpios =3D <&r_pio 0 4 GPIO_ACTIVE_LOW>; }; =20 - sw4 { + switch-4 { label =3D "sw4"; linux,code =3D ; gpios =3D <&r_pio 0 3 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/d= ts/sun8i-h3-orangepi-lite.dts index 6f9c97add54e..305b34a321f5 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts @@ -87,10 +87,10 @@ status_led { }; }; =20 - r_gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - sw4 { + switch-4 { label =3D "sw4"; linux,code =3D ; gpios =3D <&r_pio 0 3 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts b/arch/arm/boot/dt= s/sun8i-h3-orangepi-one.dts index 4759ba3f2986..59f6f6d5e7ca 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts @@ -86,10 +86,10 @@ status_led { }; }; =20 - r_gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - sw4 { + switch-4 { label =3D "sw4"; linux,code =3D ; gpios =3D <&r_pio 0 3 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts= /sun8i-h3-orangepi-pc.dts index 90f75fa85e68..b96e015f54ee 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts @@ -86,10 +86,10 @@ status_led { }; }; =20 - r_gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - sw4 { + switch-4 { label =3D "sw4"; linux,code =3D ; gpios =3D <&r_pio 0 3 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi b/arch/arm/boot/= dts/sunxi-bananapi-m2-plus.dtsi index d03f5853ef7b..d1d960a1ba48 100644 --- a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi +++ b/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi @@ -77,10 +77,10 @@ pwr_led { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - sw4 { + switch-4 { label =3D "power"; linux,code =3D ; gpios =3D <&r_pio 0 3 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi b/arch/arm/bo= ot/dts/sunxi-libretech-all-h3-cc.dtsi index 9e14fe5fdcde..89731bb34c6b 100644 --- a/arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi +++ b/arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi @@ -42,10 +42,10 @@ status_led { }; }; =20 - gpio_keys { + gpio-keys { compatible =3D "gpio-keys"; =20 - power { + key-power { label =3D "power"; linux,code =3D ; gpios =3D <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ --=20 2.34.1