From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: linux-arm-msm@vger.kernel.org,
Johan Hovold <johan+linaro@kernel.org>,
devicetree@vger.kernel.org, Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
linux-iio@vger.kernel.org
Subject: [PATCH 2/6] arm64: dts: qcom: pmk8350: rename pon label
Date: Wed, 29 Mar 2023 03:08:29 +0300 [thread overview]
Message-ID: <20230329000833.2507594-3-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20230329000833.2507594-1-dmitry.baryshkov@linaro.org>
To reduce a possibility of the conflicts, rename pmk8350's pon_pwrkey
and pon_resin to contain the PMIC name too.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/pmk8350.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 8 ++++----
arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 8 ++++----
arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/pmk8350.dtsi b/arch/arm64/boot/dts/qcom/pmk8350.dtsi
index f26fb7d32faf..455ffffb5f5c 100644
--- a/arch/arm64/boot/dts/qcom/pmk8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/pmk8350.dtsi
@@ -25,14 +25,14 @@ pmk8350_pon: pon@1300 {
reg = <0x1300>, <0x800>;
reg-names = "hlos", "pbs";
- pon_pwrkey: pwrkey {
+ pmk8350_pon_pwrkey: pwrkey {
compatible = "qcom,pmk8350-pwrkey";
interrupts = <PMK8350_SID 0x13 0x7 IRQ_TYPE_EDGE_BOTH>;
linux,code = <KEY_POWER>;
status = "disabled";
};
- pon_resin: resin {
+ pmk8350_pon_resin: resin {
compatible = "qcom,pmk8350-resin";
interrupts = <PMK8350_SID 0x13 0x6 IRQ_TYPE_EDGE_BOTH>;
status = "disabled";
diff --git a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts
index d21d2aacf201..152601832cbc 100644
--- a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts
@@ -285,17 +285,17 @@ &mpss {
firmware-name = "qcom/sm8350/modem.mbn";
};
-&pmk8350_rtc {
+&pmk8350_pon_pwrkey {
status = "okay";
};
-&pon_pwrkey {
+&pmk8350_pon_resin {
status = "okay";
+ linux,code = <KEY_VOLUMEDOWN>;
};
-&pon_resin {
+&pmk8350_rtc {
status = "okay";
- linux,code = <KEY_VOLUMEDOWN>;
};
&qupv3_id_0 {
diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
index 89382ad73133..e28f49e31b9f 100644
--- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
@@ -618,17 +618,17 @@ vol_down_n: vol-down-n-state {
};
};
-&pmk8350_rtc {
+&pmk8350_pon_pwrkey {
status = "okay";
};
-&pon_pwrkey {
+&pmk8350_pon_resin {
status = "okay";
+ linux,code = <KEY_VOLUMEUP>;
};
-&pon_resin {
+&pmk8350_rtc {
status = "okay";
- linux,code = <KEY_VOLUMEUP>;
};
&qupv3_id_0 {
diff --git a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
index 67538b5a557e..99e9b776b93d 100644
--- a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
@@ -684,11 +684,11 @@ &pmk8350_gpios {
"PMK8350_OPTION";
};
-&pon_pwrkey {
+&pmk8350_pon_pwrkey {
status = "okay";
};
-&pon_resin {
+&pmk8350_pon_resin {
linux,code = <KEY_VOLUMEUP>;
status = "okay";
};
--
2.30.2
next prev parent reply other threads:[~2023-03-29 0:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-29 0:08 [PATCH 0/6] arm64: dts: qcom: sc8280xp: remove duplication in PMIC declarations Dmitry Baryshkov
2023-03-29 0:08 ` [PATCH 1/6] dt-bindings: iio: qcom,spmi-adc7-pmk8350.h: include sid into defines Dmitry Baryshkov
2023-03-29 0:21 ` Konrad Dybcio
2023-03-30 7:49 ` Krzysztof Kozlowski
2023-04-01 14:48 ` Jonathan Cameron
2023-04-01 14:59 ` Dmitry Baryshkov
2023-03-29 0:08 ` Dmitry Baryshkov [this message]
2023-03-29 0:22 ` [PATCH 2/6] arm64: dts: qcom: pmk8350: rename pon label Konrad Dybcio
2023-03-29 0:08 ` [PATCH 3/6] arm64: dts: qcom: use main pmk8350.dtsi for sc8280xp platform Dmitry Baryshkov
2023-03-29 0:27 ` Konrad Dybcio
2023-03-29 0:29 ` Konrad Dybcio
2023-03-29 0:35 ` Konrad Dybcio
2023-03-29 11:54 ` Dmitry Baryshkov
2023-03-29 0:08 ` [PATCH 4/6] arm64: dts: qcom: pm8350: include SID into labels Dmitry Baryshkov
2023-03-29 0:33 ` Konrad Dybcio
2023-03-29 10:51 ` Dmitry Baryshkov
2023-03-29 0:08 ` [PATCH 5/6] arm64: dts: qcom: sc8280xp*: use pm8350.dtsi Dmitry Baryshkov
2023-03-29 0:08 ` [PATCH 6/6] arm64: dts: qcom: sc8280xp*: use pm8350c.dtsi and pmr735a.dtsi Dmitry Baryshkov
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=20230329000833.2507594-3-dmitry.baryshkov@linaro.org \
--to=dmitry.baryshkov@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=johan+linaro@kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lars@metafoo.de \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-iio@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