From patchwork Thu Dec 22 21:59:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marijn Suijten X-Patchwork-Id: 35968 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp14861wrn; Thu, 22 Dec 2022 14:13:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXvDI2Z5Yzt/sQQS+tIRQhuNby66/yTAQgQ9knFBWhqagtsdqGB+KddlSqEUavZ2MxltvLVa X-Received: by 2002:a62:14c6:0:b0:57f:a19a:385a with SMTP id 189-20020a6214c6000000b0057fa19a385amr21224786pfu.13.1671747190785; Thu, 22 Dec 2022 14:13:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671747190; cv=none; d=google.com; s=arc-20160816; b=vWnPoqxHuC+d83qz+A3zSzdjGQkAc+ovW1W9rgkT+8i1HNFyrPw3LAK6trx+iwtyWR fQfwnsDqCfddL2SxRiJcWRGGvtlW06Mfc8KrG0b7gAc7MOGnEISWwF5iJ7ac8QHy4uPw 4AT6MB5uep6+npRZNqbK6u00SNdZX1KpDSoO5PyancwRJSm4T27JTwAjOZPDqkjf08gI Yp7S5RrYUB4cGImX3YHtyu+sCG+w5SPXS3T6+hui6S7N7AliQj0TeGqO2gop+OL/l8rb WE4NoKWL+VaNN0r/faMUifAtWsJVkDL24FmWbHZOdq++NKgc4Jvl4hGc2mRX93ex6E+O /zTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=KUO6AZ1obMbzYEgAv51NfYxLELvVjHRu6Z/JHCBKuD4=; b=zPZ4Y7AQg3y6X3MLTt0zrgmKokDd0szkEsL5zdG/7Gf8/KB33+5YkWxASzBZ8u+DUn aI20/4/Bdp95Fwn/di2JBLpYZ+WfMWh5d92B7Uy/05gXv7WeZN8F6aDVwE+vgpqxLaqL /iX2XKc00jvcn6z/hAaO4BSta5DqCtHbhi5FBNI/MZwSlDqisXLFTlo9l2YcfNUzqhFQ zalGd+SQOeTEdMPMtXVLFkrkCET6tlwlLk8nW4WpOW7js+vSnyWONE++TkkcADeaafyX wVww5eqYYklCYjByY4IJs3vRooJeSX7kHEqNUo7V6jPP3zh04IAmNbZuDpepcJcL4pjY KHFw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k15-20020aa788cf000000b0056c882d3d06si1844338pff.199.2022.12.22.14.12.56; Thu, 22 Dec 2022 14:13:10 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235583AbiLVV7Y (ORCPT + 99 others); Thu, 22 Dec 2022 16:59:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235380AbiLVV7U (ORCPT ); Thu, 22 Dec 2022 16:59:20 -0500 Received: from relay03.th.seeweb.it (relay03.th.seeweb.it [IPv6:2001:4b7a:2000:18::164]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BA5C1DDD2; Thu, 22 Dec 2022 13:59:18 -0800 (PST) Received: from localhost.localdomain (94-209-172-39.cable.dynamic.v4.ziggo.nl [94.209.172.39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r1.th.seeweb.it (Postfix) with ESMTPSA id 39F57201DF; Thu, 22 Dec 2022 22:59:17 +0100 (CET) From: Marijn Suijten To: phone-devel@vger.kernel.org Cc: ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , Konrad Dybcio , Martin Botka , Jami Kettunen , Marijn Suijten , Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] arm64: dts: qcom: sm6350-lena: Flatten gpio-keys pinctrl state Date: Thu, 22 Dec 2022 22:59:06 +0100 Message-Id: <20221222215906.324092-1-marijn.suijten@somainline.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=unavailable 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?1752953981833796963?= X-GMAIL-MSGID: =?utf-8?q?1752953981833796963?= Pinctrl states typically collate multiple related pins. In the case of gpio-keys there's no hardware-defined relation at all except all pins representing a key; and especially on Sony's lena board there's only one pin regardless. Flatten it similar to other boards [1]. As a drive-by fix, clean up the label string. [1]: https://lore.kernel.org/linux-arm-msm/11174eb6-0a9d-7df1-6f06-da4010f76453@linaro.org/ Fixes: 2b8bbe985659 ("arm64: dts: qcom: sm6350-lena: Include pm6350 and configure buttons") Signed-off-by: Marijn Suijten Reviewed-by: Konrad Dybcio --- Changes since v1: - Replace accidental semicolon in patch title with colon. v1: https://lore.kernel.org/linux-arm-msm/20221222212634.298135-1-marijn.suijten@somainline.org/T/#u .../qcom/sm6350-sony-xperia-lena-pdx213.dts | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts b/arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts index 94f77d376662..4916d0db5b47 100644 --- a/arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts +++ b/arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts @@ -35,10 +35,10 @@ framebuffer: framebuffer@a0000000 { gpio-keys { compatible = "gpio-keys"; pinctrl-names = "default"; - pinctrl-0 = <&gpio_keys_state>; + pinctrl-0 = <&vol_down_n>; key-volume-down { - label = "volume_down"; + label = "Volume Down"; linux,code = ; gpios = <&pm6350_gpios 2 GPIO_ACTIVE_LOW>; }; @@ -305,14 +305,12 @@ touchscreen@48 { }; &pm6350_gpios { - gpio_keys_state: gpio-keys-state { - key-volume-down-pins { - pins = "gpio2"; - function = PMIC_GPIO_FUNC_NORMAL; - power-source = <0>; - bias-disable; - input-enable; - }; + vol_down_n: vol-down-n-state { + pins = "gpio2"; + function = PMIC_GPIO_FUNC_NORMAL; + power-source = <0>; + bias-disable; + input-enable; }; };