From: Konrad Dybcio <konrad.dybcio@linaro.org>
To: Dzmitry Sankouski <dsankouski@gmail.com>, linux-kernel@vger.kernel.org
Cc: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
"open list:ARM/QUALCOMM SUPPORT" <linux-arm-msm@vger.kernel.org>,
"open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS"
<devicetree@vger.kernel.org>
Subject: Re: [PATCH] arm64: dts: qcom: fix resin node duplication
Date: Tue, 27 Dec 2022 17:44:16 +0100 [thread overview]
Message-ID: <dd119bf8-7477-4da7-dadf-d5d89397a01b@linaro.org> (raw)
In-Reply-To: <20221227163810.71121-1-dsankouski@gmail.com>
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 <dsankouski@gmail.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
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 = <GIC_SPI 0x8 1 IRQ_TYPE_EDGE_BOTH>;
> - bias-pull-up;
> - debounce = <15625>;
> - linux,code = <KEY_VOLUMEDOWN>;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEDOWN>;
> + 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 = <GIC_SPI 0x8 1 IRQ_TYPE_EDGE_BOTH>;
> - debounce = <15625>;
> - bias-pull-up;
> - linux,code = <KEY_VOLUMEUP>;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEUP>;
> + 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 = <KEY_VOLUMEDOWN>;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEDOWN>;
> + 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 = <KEY_VOLUMEDOWN>;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEDOWN>;
> + 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 = <KEY_VOLUMEDOWN>;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEDOWN>;
> + 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 = <KEY_VOLUMEDOWN>;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEDOWN>;
> + 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 = <KEY_VOLUMEDOWN>;
> - debounce = <15625>;
> - bias-pull-up;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEDOWN>;
> + status = "okay";
> };
>
> &q6afedai {
next prev parent reply other threads:[~2022-12-27 16:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-27 16:38 [PATCH] arm64: dts: qcom: fix resin node duplication Dzmitry Sankouski
2022-12-27 16:44 ` Konrad Dybcio [this message]
2022-12-27 17:13 ` Marijn Suijten
2022-12-27 17:26 ` Johan Hovold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dd119bf8-7477-4da7-dadf-d5d89397a01b@linaro.org \
--to=konrad.dybcio@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dsankouski@gmail.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox