Skip to contentSkip to conversation

arm64: dts: qcom: Re-enable resin on MSM8998 and SDM845 boards

PATCH Applied Dzmitry Sankouski 3 participants 3 messages Dec 28, 2022

Subsystems (3)
Device tree bindings Arm Qualcomm mailing list Arm Qualcomm support
lore
Share & tools
lore

Dzmitry Sankouski

author
#0 lore raw

PATCH v2 1/1 arm64: dts: qcom: Re-enable resin on MSM8998 and SDM845 boards

resin node declaration was moved to pm8998.dtsi file (in disabled state). MSM8998 and SDM845 boards defining resin node did not previously have status="okay" and ended up disabled.
Re-enable it by using resin node link from pm8998.dtsi with status="okay".

Fixes f86ae6f23a9e ("arm64: dts: qcom: sagit: add initial device tree for sagit")
Signed-off-by Dzmitry Sankouski <[email protected]>
Reviewed-by Marijn Suijten <[email protected]>
Reported-by Marijn Suijten <[email protected]>
Link https://lore.kernel.org/linux-arm-msm/[email protected]/ open here

---
Changes v2:
- change description and subject

 arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts       | 11 +++--------
 .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi    | 11 +++--------
 arch/arm64/boot/dts/qcom/sdm845-db845c.dts            | 11 +++--------
 arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi        | 11 +++--------
 arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts     | 11 +++--------
 .../boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 11 +++--------
 arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts    | 11 +++--------
 7 files changed, 21 insertions(+), 56 deletions(-)
arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts +3 -8
index 310f7a2df1e8..510d12c8c512 100644
@@ -364,14 +364,9 @@ cam_snapshot_pin_a: cam-snapshot-btn-active-state {
 	};
 };
 
-&pm8998_pon {
-	resin {
-		compatible = "qcom,pm8941-resin";
-		interrupts = <GIC_SPI 0x8 1 IRQ_TYPE_EDGE_BOTH>;
-		bias-pull-up;
-		debounce = <15625>;
-		linux,code = <KEY_VOLUMEDOWN>;
-	};
+&pm8998_resin {
+	linux,code = <KEY_VOLUMEDOWN>;
+	status = "okay";
 };
 
 &qusb2phy {
arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi +3 -8
index 5da87baa2b23..3bbd5df196bf 100644
@@ -357,14 +357,9 @@ vib_default: vib-en-state {
 	};
 };
 
-&pm8998_pon {
-	resin {
-		compatible = "qcom,pm8941-resin";
-		interrupts = <GIC_SPI 0x8 1 IRQ_TYPE_EDGE_BOTH>;
-		debounce = <15625>;
-		bias-pull-up;
-		linux,code = <KEY_VOLUMEUP>;
-	};
+&pm8998_resin {
+	linux,code = <KEY_VOLUMEUP>;
+	status = "okay";
 };
 
 &qusb2phy {
arch/arm64/boot/dts/qcom/sdm845-db845c.dts +3 -8
index f41c6d600ea8..878801f540c5 100644
@@ -615,14 +615,9 @@ vol_up_pin_a: vol-up-active-state {
 	};
 };
 
-&pm8998_pon {
-	resin {
-		compatible = "qcom,pm8941-resin";
-		interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
-		debounce = <15625>;
-		bias-pull-up;
-		linux,code = <KEY_VOLUMEDOWN>;
-	};
+&pm8998_resin {
+	linux,code = <KEY_VOLUMEDOWN>;
+	status = "okay";
 };
 
 &pmi8998_lpg {
arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi +3 -8
index 1eb423e4be24..943287804e1a 100644
@@ -482,14 +482,9 @@ &mss_pil {
 	status = "okay";
 };
 
-&pm8998_pon {
-	resin {
-		compatible = "qcom,pm8941-resin";
-		interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
-		debounce = <15625>;
-		bias-pull-up;
-		linux,code = <KEY_VOLUMEDOWN>;
-	};
+&pm8998_resin {
+	linux,code = <KEY_VOLUMEDOWN>;
+	status = "okay";
 };
 
 &sdhc_2 {
arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +3 -8
index bb77ccfdc68c..e6191602c70a 100644
@@ -522,14 +522,9 @@ pinconf {
 	};
 };
 
-&pm8998_pon {
-	volume_down_resin: resin {
-		compatible = "qcom,pm8941-resin";
-		interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
-		debounce = <15625>;
-		bias-pull-up;
-		linux,code = <KEY_VOLUMEDOWN>;
-	};
+&pm8998_resin {
+	linux,code = <KEY_VOLUMEDOWN>;
+	status = "okay";
 };
 
 &pmi8998_lpg {
arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +3 -8
index eb6b2b676eca..1b12b1a4dcbc 100644
@@ -325,14 +325,9 @@ &pmi8998_wled {
 	qcom,cabc;
 };
 
-&pm8998_pon {
-	resin {
-		compatible = "qcom,pm8941-resin";
-		interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
-		debounce = <15625>;
-		bias-pull-up;
-		linux,code = <KEY_VOLUMEDOWN>;
-	};
+&pm8998_resin {
+	linux,code = <KEY_VOLUMEDOWN>;
+	status = "okay";
 };
 
 &pmi8998_rradc {
arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +3 -8
index 38ba809a95cd..fba229d0bd10 100644
@@ -530,14 +530,9 @@ pinconf {
 	};
 };
 
-&pm8998_pon {
-	resin {
-		interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
-		compatible = "qcom,pm8941-resin";
-		linux,code = <KEY_VOLUMEDOWN>;
-		debounce = <15625>;
-		bias-pull-up;
-	};
+&pm8998_resin {
+	linux,code = <KEY_VOLUMEDOWN>;
+	status = "okay";
 };
 
 &q6afedai {
Signature · 1 line
2.30.2
maintainer Applied
#1 lore raw
Quoted 6 lines · Dzmitry Sankouski

resin node declaration was moved to pm8998.dtsi file (in disabled state). MSM8998 and SDM845 boards defining resin node did not previously have status="okay" and ended up disabled.
Re-enable it by using resin node link from pm8998.dtsi with status="okay".

Applied, thanks!

[1/1] arm64: dts: qcom: Re-enable resin on MSM8998 and SDM845 boards

      commit: 4c881ab73a64cdbf8691e258ef17b740d27040a0

Best regards,

Signature · 1 line
Bjorn Andersson <[email protected]>
#2 lore raw
In reply to Dzmitry Sankouski
Quoted 4 lines · Dzmitry Sankouski

resin node declaration was moved to pm8998.dtsi file (in disabled state). MSM8998 and SDM845 boards defining resin node did not previously have status="okay" and ended up disabled.
Re-enable it by using resin node link from pm8998.dtsi with status="okay".

Thanks, that fully covers it!

- Marijn