[PATCH] arm64: dts: qcom: sm8[12]50-pm8150: Move RESIN to pm8150 dtsi
From: Konrad Dybcio <hidden>
Date: 2021-06-13 12:52:22
Also in:
linux-arm-msm, lkml
Subsystem:
arm/qualcomm mailing list, arm/qualcomm support, the rest · Maintainers:
Bjorn Andersson, Konrad Dybcio, Linus Torvalds
It's not worth duplicating the same node over and over and over and over again, so let's keep the common bits in the pm8150 DTSI, making only changing the status and keycode necessary. Signed-off-by: Konrad Dybcio <redacted> --- arch/arm64/boot/dts/qcom/pm8150.dtsi | 9 +++++++++ arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 18 +++++++----------- arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 18 +++++++----------- arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 20 ++++++++------------ 4 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/pm8150.dtsi b/arch/arm64/boot/dts/qcom/pm8150.dtsi
index 3b5e80dce5d2..7d5a35f52df1 100644
--- a/arch/arm64/boot/dts/qcom/pm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8150.dtsi@@ -59,6 +59,15 @@ pon_pwrkey: pwrkey { status = "disabled"; }; + + pon_resin: resin { + compatible = "qcom,pm8941-resin"; + interrupts = <0x0 0x8 0x1 IRQ_TYPE_EDGE_BOTH>; + debounce = <15625>; + bias-pull-up; + + status = "disabled"; + }; }; pm8150_temp: temp-alarm@2400 {
diff --git a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
index 50ee3bb97325..335aa0753fc0 100644
--- a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts@@ -362,18 +362,14 @@ &gpu { status = "okay"; }; -&pon { - pwrkey { - status = "okay"; - }; +&pon_pwrkey { + status = "okay"; +}; - resin { - compatible = "qcom,pm8941-resin"; - interrupts = <0x0 0x8 0x1 IRQ_TYPE_EDGE_BOTH>; - debounce = <15625>; - bias-pull-up; - linux,code = <KEY_VOLUMEDOWN>; - }; +&pon_resin { + status = "okay"; + + linux,code = <KEY_VOLUMEDOWN>; }; &qupv3_id_1 {
diff --git a/arch/arm64/boot/dts/qcom/sm8150-mtp.dts b/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
index 7de54b2e497e..53edf7541169 100644
--- a/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8150-mtp.dts@@ -357,18 +357,14 @@ &gpu { status = "okay"; }; -&pon { - pwrkey { - status = "okay"; - }; +&pon_pwrkey { + status = "okay"; +}; - resin { - compatible = "qcom,pm8941-resin"; - interrupts = <0x0 0x8 0x1 IRQ_TYPE_EDGE_BOTH>; - debounce = <15625>; - bias-pull-up; - linux,code = <KEY_VOLUMEDOWN>; - }; +&pon_resin { + status = "okay"; + + linux,code = <KEY_VOLUMEDOWN>; }; &qupv3_id_1 {
diff --git a/arch/arm64/boot/dts/qcom/sm8250-hdk.dts b/arch/arm64/boot/dts/qcom/sm8250-hdk.dts
index 397359ee2f85..e911a254aa0b 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-hdk.dts@@ -373,22 +373,18 @@ &gpu { status = "okay"; }; -&qupv3_id_1 { +&pon_pwrkey { status = "okay"; }; -&pon { - pwrkey { - status = "okay"; - }; +&pon_resin { + status = "okay"; - resin { - compatible = "qcom,pm8941-resin"; - interrupts = <0x0 0x8 0x1 IRQ_TYPE_EDGE_BOTH>; - debounce = <15625>; - bias-pull-up; - linux,code = <KEY_VOLUMEDOWN>; - }; + linux,code = <KEY_VOLUMEDOWN>; +}; + +&qupv3_id_1 { + status = "okay"; }; &tlmm {
--
2.32.0