arm64: dts: qcom: fix resin node duplication

PATCH In review Dzmitry Sankouski 4 participants 4 messages Dec 27, 2022

Subsystems (3)

Device tree bindings Arm Qualcomm mailing list Arm Qualcomm support

lore

Share & tools

lore

Dzmitry Sankouski

author

2022-12-27 16:38 UTC #0 lore raw

PATCH 1/1 arm64: dts: qcom: fix resin node duplication

resin node was moved to pm8998.dtsi file, and introduced duplication with other dts files, defining resin node.

Fixes f86ae6f23a9e ("arm64: dts: qcom: sagit: add initial device tree for sagit")

Signed-off-by Dzmitry Sankouski <[email protected]>

---
 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

Konrad Dybcio

Reviewed-by on v1 1/1

2022-12-27 16:44 UTC #1 lore raw

Quoted 6 lines · Dzmitry Sankouski

resin node was moved to pm8998.dtsi file, and introduced duplication with other dts files, defining resin node.
Fixes f86ae6f23a9e ("arm64: dts: qcom: sagit: add initial device tree for sagit")
Signed-off-by Dzmitry Sankouski <[email protected]>
---

Reviewed-by Konrad Dybcio <[email protected]>

Konrad

Quoted 163 lines

 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 {

Marijn Suijten

Reviewed-by on v1 1/1

2022-12-27 17:13 UTC #2 lore raw

In reply to Dzmitry Sankouski

Quoted 2 lines · Dzmitry Sankouski

resin node was moved to pm8998.dtsi file, and introduced duplication with other dts files, defining resin node.

This is fixing the right thing for the wrong reasons. As mentioned in my report these nodes did not previously have status="okay" and ended up disabled after your patch, which is much more important than a few duplicate properties that were left in place.

Please resend with a commit message that carries this load. The title could/should contain something like "Re-enable resin on MSM8998 and SDM845 boards". After that you can add my:

Reviewed-by Marijn Suijten <[email protected]>

Quoted 2 lines

Fixes f86ae6f23a9e ("arm64: dts: qcom: sagit: add initial device tree for sagit")
Signed-off-by Dzmitry Sankouski <[email protected]>

You forgot to CC me, which would have happened automatically if you added:

Reported-by Marijn Suijten <[email protected]> # https://lore.kernel.org/linux-arm-msm/[email protected]/ open here

Aside that, thanks a lot for caring about your patches and sending this fixup!

- Marijn

Johan Hovold

2022-12-27 17:26 UTC #3 lore raw

Quoted 9 lines · Marijn Suijten

Quoted 2 lines · Dzmitry Sankouski
Fixes f86ae6f23a9e ("arm64: dts: qcom: sagit: add initial device tree for sagit")
Signed-off-by Dzmitry Sankouski <[email protected]>
You forgot to CC me, which would have happened automatically if you added:
Reported-by Marijn Suijten <[email protected]> # https://lore.kernel.org/linux-arm-msm/[email protected]/ open here

You should use a Link tag (not a # comment) for the link to the report.

Johan