ARM: dts: qcom: Disable pm8941 & pm8226 smbb charger by default

Some platforms don't use the built-in charging hardware (e.g. milletwifi).
As this is an optional peripheral, default it to off.

Keep it enabled for all other boards that use smbb.

Signed-off-by: Bryant Mairs <bryant@mai.rs>
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20231203-smbb-pm8941-pm8226-v1-1-9ad75909604b@z3ntu.xyz
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/pm8226.dtsi b/arch/arm/boot/dts/qcom/pm8226.dtsi
index 2413778f371507ec2caa8b82eb77a726191417a6..2fd4f135ed84c8b28435f7f48400e61f51224647 100644 (file)
--- a/arch/arm/boot/dts/qcom/pm8226.dtsi
+++ b/arch/arm/boot/dts/qcom/pm8226.dtsi
@@ -82,6 +82,8 @@
                                          "usb-valid",
                                          "dc-valid";
 
+                       status = "disabled";
+
                        chg_otg: otg-vbus { };
                };
 

diff --git a/arch/arm/boot/dts/qcom/pm8941.dtsi b/arch/arm/boot/dts/qcom/pm8941.dtsi
index ed0ba591c755817de04c732fb90f94b94e3255f1..aca0052a02b75d272afd719eb4b32993fd99250c 100644 (file)
--- a/arch/arm/boot/dts/qcom/pm8941.dtsi
+++ b/arch/arm/boot/dts/qcom/pm8941.dtsi
@@ -99,6 +99,8 @@
 
                        usb-otg-in-supply = <&pm8941_5vs1>;
 
+                       status = "disabled";
+
                        chg_otg: otg-vbus { };
                };
 

diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts
index a39f5a161b03bbd666bea62783b32a8dcaa078d6..a2ca456012f1a070afc2805ae71ddbf6f5aac607 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts
@@ -253,6 +253,8 @@
        qcom,fast-charge-high-threshold-voltage = <4400000>;
        qcom,auto-recharge-threshold-voltage = <4300000>;
        qcom,minimum-input-voltage = <4400000>;
+
+       status = "okay";
 };
 
 &tlmm {

diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts
index 59b218042d32dd89104f8d787775759f5c9cacd1..ac228965a48559cd0e54671b1b80773a34595d1e 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts
@@ -335,6 +335,8 @@
        qcom,fast-charge-current-limit = <300000>;
        qcom,fast-charge-safe-current = <600000>;
        qcom,auto-recharge-threshold-voltage = <4240000>;
+
+       status = "okay";
 };
 
 &tlmm {

diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts
index feb78afef3a6e010b1f1cdbe5f9d1e34eb195121..0a1fd5eb3c6d26c3e3319aeb5e2c42dc068bccb1 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts
@@ -292,6 +292,8 @@
        qcom,fast-charge-high-threshold-voltage = <4350000>;
        qcom,auto-recharge-threshold-voltage = <4240000>;
        qcom,minimum-input-voltage = <4450000>;
+
+       status = "okay";
 };
 
 &tlmm {

diff --git a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
index d7fb3e0e888633d3c59fac307ab9f8893c29bf96..6fce0112361f891eae4f1061a261add9176f024a 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
@@ -430,6 +430,10 @@
        pinctrl-1 = <&sdc2_off>;
 };
 
+&smbb {
+       status = "okay";
+};
+
 &tlmm {
        sdc1_on: sdc1-on-state {
                clk-pins {

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts b/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts
index 9e90330a6231ff679f50741edf32c39c91122c68..ed328b24335f4bbaa342a8f47abf15ffb33eb261 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts
@@ -355,6 +355,8 @@
        qcom,fast-charge-high-threshold-voltage = <4350000>;
        qcom,auto-recharge-threshold-voltage = <4300000>;
        qcom,minimum-input-voltage = <4300000>;
+
+       status = "okay";
 };
 
 &usb {

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
index a43341ae4495d67e5213049ee0fa792b28acb87d..94cbad81379fbacffa53371d1272f33711cc3b7f 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
@@ -452,6 +452,8 @@
        qcom,fast-charge-low-threshold-voltage = <3400000>;
        qcom,auto-recharge-threshold-voltage = <4200000>;
        qcom,minimum-input-voltage = <4300000>;
+
+       status = "okay";
 };
 
 &tlmm {

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
index 66c422004dcd8324763dc16178451b263ef038c7..fe227fd3f908e219e20bffe3561390ca6568468e 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
@@ -408,6 +408,8 @@
        qcom,fast-charge-high-threshold-voltage = <4350000>;
        qcom,auto-recharge-threshold-voltage = <4240000>;
        qcom,minimum-input-voltage = <4450000>;
+
+       status = "okay";
 };
 
 &tlmm {

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
index 6d1412aec45ae42f416a392e6e04b03f580760c9..4c8edadea0ac63db668dbd666fbb8d92e23232b7 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
@@ -460,6 +460,10 @@
        status = "okay";
 };
 
+&smbb {
+       status = "okay";
+};
+
 &tlmm {
        gpio_hall_sensor_default: gpio-hall-sensor-default-state {
                pins = "gpio68";

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
index 818ff58350317e4aaf02dcf453b38808abef311f..7c6fe442b55921d275077eb5e00969e8be6fff36 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
@@ -585,6 +585,8 @@
        qcom,fast-charge-low-threshold-voltage = <3400000>;
        qcom,auto-recharge-threshold-voltage = <4200000>;
        qcom,minimum-input-voltage = <4300000>;
+
+       status = "okay";
 };
 
 &tlmm {