arm64: dts: qcom: sdm630-pm660: Move RESIN to pm660 dtsi

It's not worth duplicating the same node over and over again,
so let's keep the common bits in the pm660 DTSI, making only
changing the status and keycode necessary.

Also, disable RESIN/PWR by default just in case if there are
devices that doesn't use them.

Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Dang Huynh <danct12@riseup.net>
Reviewed-by: Caleb Connolly <caleb@connolly.tech>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211120214227.779742-3-danct12@riseup.net

diff --git a/arch/arm64/boot/dts/qcom/pm660.dtsi b/arch/arm64/boot/dts/qcom/pm660.dtsi
index d0ef8a1675e2d0160e222948865a0c01252069fa..c482663aad569562112d908857b17ff528614055 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm660.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm660.dtsi
@@ -54,14 +54,24 @@
                        mode-bootloader = <0x2>;
                        mode-recovery = <0x1>;
 
-                       pwrkey {
+                       pon_pwrkey: pwrkey {
                                compatible = "qcom,pm8941-pwrkey";
                                interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
                                debounce = <15625>;
                                bias-pull-up;
                                linux,code = <KEY_POWER>;
+
+                               status = "disabled";
                        };
 
+                       pon_resin: resin {
+                               compatible = "qcom,pm8941-resin";
+                               interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
+                               debounce = <15625>;
+                               bias-pull-up;
+
+                               status = "disabled";
+                       };
                };
 
                pm660_temp: temp-alarm@2400 {

diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
index 11d0a8c1cf35a39d637fcad894868695158a2571..e90c9ec846753073c14a057a1a61faf6bae7f83d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
@@ -215,14 +215,14 @@
        /* HCI Bluetooth */
 };
 
-&pon {
-       volup {
-               compatible = "qcom,pm8941-resin";
-               interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
-               debounce = <15625>;
-               bias-pull-up;
-               linux,code = <KEY_VOLUMEUP>;
-       };
+&pon_pwrkey {
+       status = "okay";
+};
+
+&pon_resin {
+       status = "okay";
+
+       linux,code = <KEY_VOLUMEUP>;
 };
 
 &qusb2phy {