arm64: dts: qcom: *8350* Consolidate PON/RESIN usage

Disable PON/RESIN keys by default and keep the RESIN keycode set-per-board, as
these settings are not common between devices (one cannot even assume all
devices have buttons nowadays..).

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211114012755.112226-7-konrad.dybcio@somainline.org

diff --git a/arch/arm64/boot/dts/qcom/pmk8350.dtsi b/arch/arm64/boot/dts/qcom/pmk8350.dtsi
index 769f972..0f94c46 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pmk8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/pmk8350.dtsi
@@ -19,16 +19,17 @@
                        compatible = "qcom,pm8998-pon";
                        reg = <0x1300>;
 
-                       pwrkey {
+                       pon_pwrkey: pwrkey {
                                compatible = "qcom,pmk8350-pwrkey";
                                interrupts = <0x0 0x13 0x7 IRQ_TYPE_EDGE_BOTH>;
                                linux,code = <KEY_POWER>;
+                               status = "disabled";
                        };
 
-                       resin {
+                       pon_resin: resin {
                                compatible = "qcom,pmk8350-resin";
                                interrupts = <0x0 0x13 0x6 IRQ_TYPE_EDGE_BOTH>;
-                               linux,code = <KEY_VOLUMEDOWN>;
+                               status = "disabled";
                        };
                };
 

diff --git a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts
index 122c282..52cf304 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts
@@ -289,6 +289,15 @@
        status = "okay";
 };
 
+&pon_pwrkey {
+       status = "okay";
+};
+
+&pon_resin {
+       status = "okay";
+       linux,code = <KEY_VOLUMEDOWN>;
+};
+
 &qupv3_id_0 {
        status = "okay";
 };