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 <dsankouski@gmail.com>
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Reported-by: Marijn Suijten <marijn.suijten@somainline.org>
Link: https://lore.kernel.org/linux-arm-msm/20221222115922.jlachctn4lxopp7a@SoMainline.org/
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221228115243.201038-1-dsankouski@gmail.com

diff --git a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
index 0e273938b59d2939e8163a4614e5164cefc569fd..ebf274472f696f2289ba443fb35ae78bb9c8ccac 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
@@ -364,14 +364,9 @@
        };
 };
 
-&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 {

diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
index 1f64b70260fe05cb40392a9ab6d9c991cd8b7cc9..8204147588881eae459f4170f334a863d2e1fbb3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
@@ -357,14 +357,9 @@
        };
 };
 
-&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 {

diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index 7c3efe3cbf5bed52257f02e8861dea432a84227f..1892c65378508225631c0bc4106e4561187e7fad 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -615,14 +615,9 @@
        };
 };
 
-&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 {

diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
index f54d3302fb8ae1838e424e6db4fe4c6f42a1a2f7..6126bed145c87ab112f6c4fe61a65cb20720abbe 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
@@ -482,14 +482,9 @@
        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 {

diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index 1934662c2bde20894155b39e95530c5c9ec4bc3c..84e69de3e9b6c8bbeb506ab121dcbce2aba061b6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -522,14 +522,9 @@
        };
 };
 
-&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 {

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
index ba5a37cb3c9ebf6b2fddd7f76227f8eb6d7b16e6..49780c1230096e7b5b9aa8d68013b46f5ad1dad3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -325,14 +325,9 @@
        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 {

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
index 46346f7146eda98769a3e14d4cc7a7b89e6d3d15..4c65f4eefeb131b6813f1afd7d986ee7272fb8e2 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
@@ -530,14 +530,9 @@
        };
 };
 
-&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 {