arm64: dts: qcom: sm8[12]50-pm8150: Move RESIN to pm8150 dtsi

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 <konrad.dybcio@somainline.org>
Link: https://lore.kernel.org/r/20210613124822.124039-1-konrad.dybcio@somainline.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/pm8150.dtsi b/arch/arm64/boot/dts/qcom/pm8150.dtsi
index 35ddac1ccd46e816cc5e60ed5de3c56cbe8a291e..c566a64b1373fc55b7d0e338d8342112dd9aabdc 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8150.dtsi
@@ -60,6 +60,15 @@
 
                                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 50ee3bb97325ac48ab5323748d6645c615daff77..335aa0753fc02309cb8d905ae2e9e28d126dcb07 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
@@ -362,18 +362,14 @@
        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 7de54b2e497e82904abb1831bfe04348e03e1095..53edf754116926e85308a5fea2f9029664fe7324 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
@@ -357,18 +357,14 @@
        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 bc6f81254ef76687063879813e6658d0025896ff..47742816ac2fe0091f5bf547ff8df17aa011ca6e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-hdk.dts
@@ -372,22 +372,18 @@
        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 {