From mboxrd@z Thu Jan 1 00:00:00 1970 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 5AD81C4167B for ; Tue, 27 Dec 2022 16:44:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229608AbiL0Qo3 (ORCPT ); Tue, 27 Dec 2022 11:44:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229809AbiL0QoW (ORCPT ); Tue, 27 Dec 2022 11:44:22 -0500 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DEDE1D6 for ; Tue, 27 Dec 2022 08:44:21 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id j17so10802825lfr.3 for ; Tue, 27 Dec 2022 08:44:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=iSSmBFbM1dUp8BQXcBkFZc09Iec6Jot4VF8P/JAzjNs=; b=My3fVk4mBdxNFOiuo6lKunblDZWH+qJb/tKHAYhhKW3tseNnkKmhK8NxZh7SdJZpBh ROpHhKnTIa4sD9yqzdBzUu6Kkyc/3sjLpVg1RSMF1c1pkBKjKnzKw0uShxW2vbYUHrPL Ft07vQU8wMndlMTZK4K3jLJbRQG6duiloSIVjBGN/XBLRm27Wu+Gtj8gTCJQOUBR+mUc mIex0oeTXjHw2fCq1nqKO42xdoWmDKOgcVSzGewCh8GpSm3urvZWJYNIsLJM7ajn/0fE FOsFVBs2opRlXB3KzRZnu3w62Vx1kWVBgpo8ves3fEHKAjjMJkRWzAcyPKHug/LqrsmY K7VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iSSmBFbM1dUp8BQXcBkFZc09Iec6Jot4VF8P/JAzjNs=; b=0wXnk6oi18mITmQbFDtmAWPnezpDxRuHaalVY4R8AWyyVPXTzex2OkdeWkE80fmTx4 8qhmkiUtoyp5mTzt+JoY+OmSEGqkwjrJbWUy41dG9+XZFW3cnzhvOrwOL0bzBmB06xnc 75loTwvEFbBwLemJUCOm/3OiWPzcESKYkcvxLOxnQTwzocDHG0HJn/t82OHoUIMGnV/L 2MdA4P1Jx3XFA18ZMszBMbIuUgijaJyWDNk6V1pyRjQ//cbIFR0eZ8vdqFu9yBzazhfY A+fJzK/ld52CVbLLIPfBo5CfZIWjMG7cP+D45R3WYE2/o753dcEVpzHyrr+CFfaPTeLp 3gQQ== X-Gm-Message-State: AFqh2kqf/LAx8XeYQdomrs9lNMlJK6VgTVOQhbg9MwaqhwGPcgPMT/U4 x9wCKeVy0ZrkAQ5/H6MKiW/P/Vtv8eV4jKzK X-Google-Smtp-Source: AMrXdXuP51u9ToggXenQtHR/wOO1q9WzWFUCfyKdDqoxRMrdeEj6807Innx1WbYqV4AwDQ0yBbx2mg== X-Received: by 2002:a05:6512:1594:b0:4b5:6a20:ca90 with SMTP id bp20-20020a056512159400b004b56a20ca90mr7490685lfb.10.1672159459723; Tue, 27 Dec 2022 08:44:19 -0800 (PST) Received: from [192.168.1.101] (abyl184.neoplus.adsl.tpnet.pl. [83.9.31.184]) by smtp.gmail.com with ESMTPSA id d9-20020ac25ec9000000b00492ce573726sm2340358lfq.47.2022.12.27.08.44.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 27 Dec 2022 08:44:19 -0800 (PST) Message-ID: Date: Tue, 27 Dec 2022 17:44:16 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH] arm64: dts: qcom: fix resin node duplication Content-Language: en-US To: Dzmitry Sankouski , linux-kernel@vger.kernel.org Cc: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , "open list:ARM/QUALCOMM SUPPORT" , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" References: <20221227163810.71121-1-dsankouski@gmail.com> From: Konrad Dybcio In-Reply-To: <20221227163810.71121-1-dsankouski@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 27.12.2022 17:38, Dzmitry Sankouski wrote: > resin node was moved to pm8998.dtsi file, and introduced duplication > with other dts files, defining resin node. > > Fixes: f86ae6f23a9e ("arm64: dts: qcom: sagit: add initial device tree for sagit") > Signed-off-by: Dzmitry Sankouski > --- Reviewed-by: Konrad Dybcio Konrad > arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 11 +++-------- > .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 11 +++-------- > arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 11 +++-------- > arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 11 +++-------- > arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 11 +++-------- > .../boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 11 +++-------- > arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 11 +++-------- > 7 files changed, 21 insertions(+), 56 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts > index 310f7a2df1e8..510d12c8c512 100644 > --- a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts > +++ b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts > @@ -364,14 +364,9 @@ cam_snapshot_pin_a: cam-snapshot-btn-active-state { > }; > }; > > -&pm8998_pon { > - resin { > - compatible = "qcom,pm8941-resin"; > - interrupts = ; > - bias-pull-up; > - debounce = <15625>; > - linux,code = ; > - }; > +&pm8998_resin { > + linux,code = ; > + status = "okay"; > }; > > &qusb2phy { > diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi > index 5da87baa2b23..3bbd5df196bf 100644 > --- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi > +++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi > @@ -357,14 +357,9 @@ vib_default: vib-en-state { > }; > }; > > -&pm8998_pon { > - resin { > - compatible = "qcom,pm8941-resin"; > - interrupts = ; > - debounce = <15625>; > - bias-pull-up; > - linux,code = ; > - }; > +&pm8998_resin { > + linux,code = ; > + status = "okay"; > }; > > &qusb2phy { > diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts > index f41c6d600ea8..878801f540c5 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts > +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts > @@ -615,14 +615,9 @@ vol_up_pin_a: vol-up-active-state { > }; > }; > > -&pm8998_pon { > - resin { > - compatible = "qcom,pm8941-resin"; > - interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>; > - debounce = <15625>; > - bias-pull-up; > - linux,code = ; > - }; > +&pm8998_resin { > + linux,code = ; > + status = "okay"; > }; > > &pmi8998_lpg { > diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi > index 1eb423e4be24..943287804e1a 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi > @@ -482,14 +482,9 @@ &mss_pil { > status = "okay"; > }; > > -&pm8998_pon { > - resin { > - compatible = "qcom,pm8941-resin"; > - interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>; > - debounce = <15625>; > - bias-pull-up; > - linux,code = ; > - }; > +&pm8998_resin { > + linux,code = ; > + status = "okay"; > }; > > &sdhc_2 { > diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts > index bb77ccfdc68c..e6191602c70a 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts > +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts > @@ -522,14 +522,9 @@ pinconf { > }; > }; > > -&pm8998_pon { > - volume_down_resin: resin { > - compatible = "qcom,pm8941-resin"; > - interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>; > - debounce = <15625>; > - bias-pull-up; > - linux,code = ; > - }; > +&pm8998_resin { > + linux,code = ; > + status = "okay"; > }; > > &pmi8998_lpg { > diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi > index eb6b2b676eca..1b12b1a4dcbc 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi > @@ -325,14 +325,9 @@ &pmi8998_wled { > qcom,cabc; > }; > > -&pm8998_pon { > - resin { > - compatible = "qcom,pm8941-resin"; > - interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>; > - debounce = <15625>; > - bias-pull-up; > - linux,code = ; > - }; > +&pm8998_resin { > + linux,code = ; > + status = "okay"; > }; > > &pmi8998_rradc { > diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts > index 38ba809a95cd..fba229d0bd10 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts > +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts > @@ -530,14 +530,9 @@ pinconf { > }; > }; > > -&pm8998_pon { > - resin { > - interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>; > - compatible = "qcom,pm8941-resin"; > - linux,code = ; > - debounce = <15625>; > - bias-pull-up; > - }; > +&pm8998_resin { > + linux,code = ; > + status = "okay"; > }; > > &q6afedai {