From patchwork Thu Oct 27 08:37:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 11655 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp107045wru; Thu, 27 Oct 2022 01:40:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7NwUcdJQ9cstbwxyW+yZw8o1U+woue8GI/ttT55pSvEWW+ufHhOh0Pb09wncIHsxNLk0f1 X-Received: by 2002:a17:907:6e9e:b0:78e:214b:e3c2 with SMTP id sh30-20020a1709076e9e00b0078e214be3c2mr40402502ejc.15.1666860011205; Thu, 27 Oct 2022 01:40:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666860011; cv=none; d=google.com; s=arc-20160816; b=UfyBXPnUCc3RtcECwCW7ULqUVXD9n3AE3+bXz5DsnnWqZTLyvUfULAhnD9e8tzz7Jz SSJ3X2Z6Vbt5eZI7ZZIm568VQD4GjKFeRcOGqG46LOd+LOx7fzygNbWtRVGIm6Cv08UF m3zx1k0HWd/6HeVcAyLxCOutRGmCA6WoWHLDcJao0xWnctj1pvaVyIljNLA/iZ+Uc+HI b4D78ABMW4yTCdT8iyYL6MMccoOSi0wUhDVfXtX95sUZ/KV0EPHwsUrxGbCxVpkpQSmX J1l/xudw9tdD1oc2zM8hgt++m7DQcPh+V6AaejeltL3nxKbsxOFCV19K6GSX2G+bOEjd PT+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language:cc:to :subject:from:user-agent:mime-version:date:message-id:dkim-signature; bh=DHHglLeoa0xl2Lso2Kv9u+moRM1p+bVCpjecaPrLp1s=; b=PDa+43F9iP1Ay4zYprjd1vk9Fu2pl62Oobx3Vb/n9IDXGd60jjQ46lrEDuLbp49CU5 tVa+NdJamVOhWeWo09woZKLzjOq1V+3PIysrLdsLghZWbjJyyKy3VXXMFnFyyavu1nwW g4UxYRGUoUegr/Eg2t+nyb74X5AKAL5pivDuLKvEA1wqqIV32oVSkkG5m8DHTFOEApFl c0UwvhaAcgk84E1VkWUcOippRNmaCMjqKYoH4cxjBPeJF83jQjNroxeSKkDnOfHcx26P 21S0sD2NbSe+afcGmpOBMpPiMhRpxqoYRbduukgAWbGr5zh8HRVTu5YAIpV7amrAMEH/ ajQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=M5hzx7V4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mp14-20020a1709071b0e00b0078d221bd0c2si844495ejc.1009.2022.10.27.01.39.46; Thu, 27 Oct 2022 01:40:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=M5hzx7V4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235067AbiJ0IiW (ORCPT + 99 others); Thu, 27 Oct 2022 04:38:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235058AbiJ0IiE (ORCPT ); Thu, 27 Oct 2022 04:38:04 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA47992F4C; Thu, 27 Oct 2022 01:37:35 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id k2so2512211ejr.2; Thu, 27 Oct 2022 01:37:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=DHHglLeoa0xl2Lso2Kv9u+moRM1p+bVCpjecaPrLp1s=; b=M5hzx7V4PkX3+liCaEQXoRKFUNXaQAYvslC8zW0Xuk6v2kwLNiAtBRORZwRHm1PoQF pazONDEJ5n0a/drlgtuhcMj6nMNTk/vnSC5PiRChuIcTqlvlgb2f4c1HlmMnXoJZhyDs k7xVqin+Dw0OK5JN14fmUEN9vW+4kt+bI/gL9Lj7gfGAXnsEzWgyXU/dK8IH2gWgm4RF pD30calUGp7fKFFNrq/9eDu57Wxtlffj9yzi5EROkArSUhqdhkgV/hG+v0kR9Vwc/GkA JXnGSwzF6TW0ixCk3hH6gnfV/r2Gf+pNrttmt3z57mbtswfYPkV6logT5Wi0wS/uzv0g OYvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=DHHglLeoa0xl2Lso2Kv9u+moRM1p+bVCpjecaPrLp1s=; b=MgWuBHMzmdGfi10h0uPE1B/Xyte9lC82vYjScMHjdek/d4TEUAy9i0O1aBwcVfTFLQ m/1XGxImSvmaTHsJfvQEXSswabWLYQw7f3NRKK7OjpDpwOMcOSDXs4Bjhsl3IHrCh+OA I9XebxiN7pAcmYPRzE1wPv4uy1AfEbWkxHfa+y+0zhuBNz1knggGqxR4ihxaGZwLq5cJ SWKG4UbQNWI5ZW2pPrW1CeZFRrAiVPoTPIe+EDt+k7QLqVakg/OaMeahM0mPOYG9bTAF WH0nFR1Sx8so4uuz+tSzbyDdwY/J9LgThkIrNNk2GGJgBHOiEZf58sNBJp4314ssztfV UXFA== X-Gm-Message-State: ACrzQf0LCfhcNdOJzFp20AyHCrb5l9gG9Frrxal4Aki8ua256Sl05pwI Rdp0fiEue79dwlHvJrHlpsq4gY12Bdc= X-Received: by 2002:a17:907:160c:b0:78d:b6f5:9f56 with SMTP id hb12-20020a170907160c00b0078db6f59f56mr51155ejc.325.1666859854253; Thu, 27 Oct 2022 01:37:34 -0700 (PDT) Received: from [192.168.2.2] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id d10-20020aa7c1ca000000b0045d74aa401fsm570590edp.60.2022.10.27.01.37.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 27 Oct 2022 01:37:33 -0700 (PDT) Message-ID: <7a0013b1-3a55-a344-e9ea-eacb4b49433c@gmail.com> Date: Thu, 27 Oct 2022 10:37:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 From: Johan Jonker Subject: [PATCH v1 1/2] ARM: dts: rockchip: fix adc-keys sub node names To: heiko@sntech.de Cc: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Content-Language: en-US X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747829402950432775?= X-GMAIL-MSGID: =?utf-8?q?1747829402950432775?= Fix adc-keys sub node names on Rockchip boards, so that they match with regex: '^button-' Signed-off-by: Johan Jonker --- arch/arm/boot/dts/rk3066a-mk808.dts | 2 +- arch/arm/boot/dts/rk3288-evb.dtsi | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/rk3066a-mk808.dts b/arch/arm/boot/dts/rk3066a-mk808.dts index cfa318a50..2db5ba706 100644 --- a/arch/arm/boot/dts/rk3066a-mk808.dts +++ b/arch/arm/boot/dts/rk3066a-mk808.dts @@ -32,7 +32,7 @@ keyup-threshold-microvolt = <2500000>; poll-interval = <100>; - recovery { + button-recovery { label = "recovery"; linux,code = ; press-threshold-microvolt = <0>; diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi index 399d6b9c5..382d2839c 100644 --- a/arch/arm/boot/dts/rk3288-evb.dtsi +++ b/arch/arm/boot/dts/rk3288-evb.dtsi @@ -28,19 +28,19 @@ press-threshold-microvolt = <300000>; }; - menu { + button-menu { label = "Menu"; linux,code = ; press-threshold-microvolt = <640000>; }; - esc { + button-esc { label = "Esc"; linux,code = ; press-threshold-microvolt = <1000000>; }; - home { + button-home { label = "Home"; linux,code = ; press-threshold-microvolt = <1300000>; From patchwork Thu Oct 27 08:38:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 11663 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp114973wru; Thu, 27 Oct 2022 02:01:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7KBSa2jqFARBF4ZlZ8lwpVJSXMYJ3H/1u7RsBhHN/lsjpRLYzdspFGrY9pab2fcj3dmRiC X-Received: by 2002:a17:907:a428:b0:78d:9fab:84fb with SMTP id sg40-20020a170907a42800b0078d9fab84fbmr39720951ejc.694.1666861306391; Thu, 27 Oct 2022 02:01:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666861306; cv=none; d=google.com; s=arc-20160816; b=zn80gehn1I4H0qMOpD7LUKlG97VsCR5SKA9Uvs9Fu+7Bm4ydfT/7A+NorRSaTcw+fC R31wVOGgjSQfEYdG8JhrK4RkJwChNASbcqLmosKJZpKgnz8r9wDE99Zp6fU9vpDzo8fi ZbKom6Zcr9j/KHGs0ef5U7iBGdZncsHf+p+kpgz9nMwlHz5TUZlG8sg9phhpXa4x+Br9 I5Vu2M8P2wfULbsHQqMqIBaI2KuUpFcvDHKkMJxciCXnJCapsTDiwlxXB22QOF+rVYVh ixiT9Xplg4SO93imiODi3cvwFgyRD2hDb4/EXhJdTQQwmurMlq+GJ3+VoXNRjOGPHKJ4 R3YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :content-language:references:cc:to:subject:from:user-agent :mime-version:date:message-id:dkim-signature; bh=puwTlLP9lmf0zgYvX1dMoVhRhEqgzhe1ybxuYXcJx78=; b=QSZT7KtenWVocBqhGlelcChmJUZ0AkyPc7ZbSfeGcyPiHQDYGjayfvQdT4pKFvH8/B MkU+L/3Ta3ptLRenVYyuNGPswM6MZ5uBE13XWIW3KnWzG1IB4WMkTQhvEqe3GZBP9WTu upQWrlFu8QMAJlBy1D/DwA0zkOa/RZHh2uKZvALXuRwaOddcmK/yHos9hZo92haECbC2 2V+vGD48xxIpt0MgNn9ZyGo7skVAjY9EUYoM/og0Wc3dxMc2K6r7/MQKfpoBkAFf1OXD dPSh+dnKmMIyWVhNxT5wuS6AD09DoJvgWiAapN/fp9yOJadxKW4U+FUyRUfxRWUw2qoF /eWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=olbjbkkA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qk37-20020a1709077fa500b0078dfd359c52si951671ejc.602.2022.10.27.02.01.21; Thu, 27 Oct 2022 02:01:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=olbjbkkA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234987AbiJ0Ii7 (ORCPT + 99 others); Thu, 27 Oct 2022 04:38:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235096AbiJ0Iip (ORCPT ); Thu, 27 Oct 2022 04:38:45 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B41615D094; Thu, 27 Oct 2022 01:38:38 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id 21so1501943edv.3; Thu, 27 Oct 2022 01:38:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=puwTlLP9lmf0zgYvX1dMoVhRhEqgzhe1ybxuYXcJx78=; b=olbjbkkA5TroRbqv12SWc+RlX22yHHX0FKgAQgyNP/fETknI3U7L3O+JaviZGx1ArZ jZtTw84Nowlu3Gma+VVhukw0QvM/tw0tlWXDoi8bxj3cstvOylI2OiP2ia0aTtqOzz9R 0Rv6btHw/jf8nd+kIB9x5fzZyiCf3G75vLLqVpepEvtVqKhvEAOqN37AQNMtW5PP8tsf 0YKxe0ljnzki3QGs/74EXI7hmR8S75ZdD6oJMtQalbnTXoFQyyVxVyyKLSzgOGs46XTg QCrpuQH+z7IkoIcrOw8PbyYbwNWu/hF7jU5sGiYoHn083ws4ZmU4d9Ch0g4QNTeOwTWV T2Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=puwTlLP9lmf0zgYvX1dMoVhRhEqgzhe1ybxuYXcJx78=; b=qXLHJDDfN8n/SfWXgvtNG280Z15hZo/NbgqmgwdBpiXYLQushVvqy4xRYU+/wtDkZ4 LMvxJovUf+EetfbDYWxm6IGvIeNCKIQt+00LUwZuEd6a0Ni0TTHMlFqyt0TmW/wIoa7a 0vRXFKZ3IdEnd0xW4OxpxXwC6oC+z1GIOU9ynXodlVqSaoEHWnpp9xbQVHdwBzF4ImiB MJbC2Otj3PqgZJ9COa6QOr0YeyP59vwkaRwe2gR0RO3bK3H90CKYm7Lre2/I0algezsf oUp8HgHiS1kz2r53x7skIs/lKzbDTgr+Q0fCwHK90vVqbER01AK+wi9UXMPfn7ezuXY3 bO7Q== X-Gm-Message-State: ACrzQf0Zt2SofRCGrV/nDv15YbQW/0yxSldGCPuMdlmwlfgwZaUmOYYH oNSPcysnZ/ee1RupKdnzIuE= X-Received: by 2002:a05:6402:2893:b0:461:59fd:9b4 with SMTP id eg19-20020a056402289300b0046159fd09b4mr27999036edb.389.1666859917112; Thu, 27 Oct 2022 01:38:37 -0700 (PDT) Received: from [192.168.2.2] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id w15-20020a056402268f00b004615bea1d5bsm615517edd.35.2022.10.27.01.38.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 27 Oct 2022 01:38:36 -0700 (PDT) Message-ID: <6a6a3603-5540-cacc-2672-c015af1ec684@gmail.com> Date: Thu, 27 Oct 2022 10:38:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 From: Johan Jonker Subject: [PATCH v1 2/2] arm64: dts: rockchip: fix adc-keys sub node names To: heiko@sntech.de Cc: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org References: <7a0013b1-3a55-a344-e9ea-eacb4b49433c@gmail.com> Content-Language: en-US In-Reply-To: <7a0013b1-3a55-a344-e9ea-eacb4b49433c@gmail.com> X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747830761407296149?= X-GMAIL-MSGID: =?utf-8?q?1747830761407296149?= Fix adc-keys sub node names on Rockchip boards, so that they match with regex: '^button-' Signed-off-by: Johan Jonker --- arch/arm64/boot/dts/rockchip/px30-evb.dts | 10 +++++----- arch/arm64/boot/dts/rockchip/rk3308-evb.dts | 12 ++++++------ arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 4 ++-- arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 2 +- .../boot/dts/rockchip/rk3399-sapphire-excavator.dts | 4 ++-- arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/rockchip/px30-evb.dts b/arch/arm64/boot/dts/rockchip/px30-evb.dts index 07008d844..c1bbd555f 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb.dts @@ -30,31 +30,31 @@ keyup-threshold-microvolt = <1800000>; poll-interval = <100>; - esc-key { + button-esc { label = "esc"; linux,code = ; press-threshold-microvolt = <1310000>; }; - home-key { + button-home { label = "home"; linux,code = ; press-threshold-microvolt = <624000>; }; - menu-key { + button-menu { label = "menu"; linux,code = ; press-threshold-microvolt = <987000>; }; - vol-down-key { + button-down { label = "volume down"; linux,code = ; press-threshold-microvolt = <300000>; }; - vol-up-key { + button-up { label = "volume up"; linux,code = ; press-threshold-microvolt = <17000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb.dts index 9fe9b0d11..184b84fdd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-evb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb.dts @@ -23,7 +23,7 @@ poll-interval = <100>; keyup-threshold-microvolt = <1800000>; - func-key { + button-func { linux,code = ; label = "function"; press-threshold-microvolt = <18000>; @@ -37,31 +37,31 @@ poll-interval = <100>; keyup-threshold-microvolt = <1800000>; - esc-key { + button-esc { linux,code = ; label = "micmute"; press-threshold-microvolt = <1130000>; }; - home-key { + button-home { linux,code = ; label = "mode"; press-threshold-microvolt = <901000>; }; - menu-key { + button-menu { linux,code = ; label = "play"; press-threshold-microvolt = <624000>; }; - vol-down-key { + button-down { linux,code = ; label = "volume down"; press-threshold-microvolt = <300000>; }; - vol-up-key { + button-up { linux,code = ; label = "volume up"; press-threshold-microvolt = <18000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts b/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts index 43c928ac9..1deef53a4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts @@ -25,7 +25,7 @@ keyup-threshold-microvolt = <1800000>; poll-interval = <100>; - recovery { + button-recovery { label = "recovery"; linux,code = ; press-threshold-microvolt = <17000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi index 2a332763c..9d9297bc5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi @@ -123,7 +123,7 @@ keyup-threshold-microvolt = <1800000>; poll-interval = <100>; - recovery { + button-recovery { label = "Recovery"; linux,code = ; press-threshold-microvolt = <18000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts index 452728b82..3bf8f959e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts @@ -39,7 +39,7 @@ keyup-threshold-microvolt = <1800000>; poll-interval = <100>; - recovery { + button-recovery { label = "Recovery"; linux,code = ; press-threshold-microvolt = <18000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts index 72182c58c..65cb21837 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts @@ -19,7 +19,7 @@ keyup-threshold-microvolt = <1500000>; poll-interval = <100>; - recovery { + button-recovery { label = "Recovery"; linux,code = ; press-threshold-microvolt = <18000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts index 9e2e246e0..dba4d03bf 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts @@ -52,13 +52,13 @@ press-threshold-microvolt = <300000>; }; - back { + button-back { label = "Back"; linux,code = ; press-threshold-microvolt = <985000>; }; - menu { + button-menu { label = "Menu"; linux,code = ; press-threshold-microvolt = <1314000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi index 2f4b1b2e3..bbf1e3f24 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi @@ -41,7 +41,7 @@ keyup-threshold-microvolt = <1500000>; poll-interval = <100>; - recovery { + button-recovery { label = "Recovery"; linux,code = ; press-threshold-microvolt = <18000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts index 13927e7d0..dbec2b717 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts @@ -33,13 +33,13 @@ press-threshold-microvolt = <300000>; }; - back { + button-back { label = "Back"; linux,code = ; press-threshold-microvolt = <985000>; }; - menu { + button-menu { label = "Menu"; linux,code = ; press-threshold-microvolt = <1314000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi index 0d4586813..8d61f824c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi @@ -23,7 +23,7 @@ io-channel-names = "buttons"; keyup-threshold-microvolt = <1750000>; - recovery { + button-recovery { label = "recovery"; linux,code = ; press-threshold-microvolt = <0>;