diff --git a/arch/arm/boot/dts/qcom/msm-pmfalcon.dtsi b/arch/arm/boot/dts/qcom/msm-pmfalcon.dtsi
index b8fac8a183a2..8f8bdf2e899c 100644
--- a/arch/arm/boot/dts/qcom/msm-pmfalcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-pmfalcon.dtsi
@@ -273,6 +273,135 @@
 			};
 		};
 
+		pmfalcon_charger: qcom,qpnp-smb2 {
+			compatible = "qcom,qpnp-smb2";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			qcom,pmic-revid = <&pmfalcon_revid>;
+
+			io-channels = <&pmfalcon_rradc 8>,
+				      <&pmfalcon_rradc 10>,
+				      <&pmfalcon_rradc 3>,
+				      <&pmfalcon_rradc 4>;
+			io-channel-names = "charger_temp",
+					   "charger_temp_max",
+					   "usbin_i",
+					   "usbin_v";
+
+			qcom,wipower-max-uw = <5000000>;
+			dpdm-supply = <&qusb_phy0>;
+
+			qcom,thermal-mitigation
+					= <3000000 1500000 1000000 500000>;
+
+			qcom,chgr@1000 {
+				reg = <0x1000 0x100>;
+				interrupts = <0x2 0x10 0x0 IRQ_TYPE_NONE>,
+					     <0x2 0x10 0x1 IRQ_TYPE_NONE>,
+					     <0x2 0x10 0x2 IRQ_TYPE_NONE>,
+					     <0x2 0x10 0x3 IRQ_TYPE_NONE>,
+					     <0x2 0x10 0x4 IRQ_TYPE_NONE>;
+
+				interrupt-names = "chg-error",
+						  "chg-state-change",
+						  "step-chg-state-change",
+						  "step-chg-soc-update-fail",
+						  "step-chg-soc-update-request";
+			};
+
+			qcom,otg@1100 {
+				reg = <0x1100 0x100>;
+				interrupts = <0x2 0x11 0x0 IRQ_TYPE_NONE>,
+					     <0x2 0x11 0x1 IRQ_TYPE_NONE>,
+					     <0x2 0x11 0x2 IRQ_TYPE_NONE>,
+					     <0x2 0x11 0x3 IRQ_TYPE_NONE>;
+
+				interrupt-names = "otg-fail",
+						  "otg-overcurrent",
+						  "otg-oc-dis-sw-sts",
+						  "testmode-change-detect";
+			};
+
+			qcom,bat-if@1200 {
+				reg = <0x1200 0x100>;
+				interrupts = <0x2 0x12 0x0 IRQ_TYPE_NONE>,
+					     <0x2 0x12 0x1 IRQ_TYPE_NONE>,
+					     <0x2 0x12 0x2 IRQ_TYPE_NONE>,
+					     <0x2 0x12 0x3 IRQ_TYPE_NONE>,
+					     <0x2 0x12 0x4 IRQ_TYPE_NONE>,
+					     <0x2 0x12 0x5 IRQ_TYPE_NONE>;
+
+				interrupt-names = "bat-temp",
+						  "bat-ocp",
+						  "bat-ov",
+						  "bat-low",
+						  "bat-therm-or-id-missing",
+						  "bat-terminal-missing";
+			};
+
+			qcom,usb-chgpth@1300 {
+				reg = <0x1300 0x100>;
+				interrupts = <0x2 0x13 0x0 IRQ_TYPE_NONE>,
+					     <0x2 0x13 0x1 IRQ_TYPE_NONE>,
+					     <0x2 0x13 0x2 IRQ_TYPE_NONE>,
+					     <0x2 0x13 0x3 IRQ_TYPE_NONE>,
+					     <0x2 0x13 0x4 IRQ_TYPE_NONE>,
+					     <0x2 0x13 0x5 IRQ_TYPE_NONE>,
+					     <0x2 0x13 0x6 IRQ_TYPE_NONE>,
+					     <0x2 0x13 0x7 IRQ_TYPE_NONE>;
+
+				interrupt-names = "usbin-collapse",
+						  "usbin-lt-3p6v",
+						  "usbin-uv",
+						  "usbin-ov",
+						  "usbin-plugin",
+						  "usbin-src-change",
+						  "usbin-icl-change",
+						  "type-c-change";
+			};
+
+			qcom,dc-chgpth@1400 {
+				reg = <0x1400 0x100>;
+				interrupts = <0x2 0x14 0x0 IRQ_TYPE_NONE>,
+					     <0x2 0x14 0x1 IRQ_TYPE_NONE>,
+					     <0x2 0x14 0x2 IRQ_TYPE_NONE>,
+					     <0x2 0x14 0x3 IRQ_TYPE_NONE>,
+					     <0x2 0x14 0x4 IRQ_TYPE_NONE>,
+					     <0x2 0x14 0x5 IRQ_TYPE_NONE>,
+					     <0x2 0x14 0x6 IRQ_TYPE_NONE>;
+
+				interrupt-names = "dcin-collapse",
+						  "dcin-lt-3p6v",
+						  "dcin-uv",
+						  "dcin-ov",
+						  "dcin-plugin",
+						  "div2-en-dg",
+						  "dcin-icl-change";
+			};
+
+			qcom,chgr-misc@1600 {
+				reg = <0x1600 0x100>;
+				interrupts = <0x2 0x16 0x0 IRQ_TYPE_NONE>,
+					     <0x2 0x16 0x1 IRQ_TYPE_NONE>,
+					     <0x2 0x16 0x2 IRQ_TYPE_NONE>,
+					     <0x2 0x16 0x3 IRQ_TYPE_NONE>,
+					     <0x2 0x16 0x4 IRQ_TYPE_NONE>,
+					     <0x2 0x16 0x5 IRQ_TYPE_NONE>,
+					     <0x2 0x16 0x6 IRQ_TYPE_NONE>,
+					     <0x2 0x16 0x7 IRQ_TYPE_NONE>;
+
+				interrupt-names = "wdog-snarl",
+						  "wdog-bark",
+						  "aicl-fail",
+						  "aicl-done",
+						  "high-duty-cycle",
+						  "input-current-limiting",
+						  "temperature-change",
+						  "switcher-power-ok";
+			};
+		};
+
 		pmfalcon_adc_tm: vadc@3400 {
 			compatible = "qcom,qpnp-adc-tm-hc";
 			reg = <0x3400 0x100>;
@@ -337,6 +466,67 @@
 			#size-cells = <0>;
 			#io-channel-cells = <1>;
 		};
+
+		pmfalcon_fg: qpnp,fg {
+			compatible = "qcom,fg-gen3";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			qcom,pmic-revid = <&pmfalcon_revid>;
+			io-channels = <&pmfalcon_rradc 0>;
+			io-channel-names = "rradc_batt_id";
+			qcom,fg-esr-timer-awake = <96>;
+			qcom,fg-esr-timer-asleep = <256>;
+			qcom,cycle-counter-en;
+			status = "okay";
+
+			qcom,fg-batt-soc@4000 {
+				status = "okay";
+				reg = <0x4000 0x100>;
+				interrupts = <0x2 0x40 0x0 IRQ_TYPE_EDGE_BOTH>,
+					     <0x2 0x40 0x1 IRQ_TYPE_EDGE_BOTH>,
+					     <0x2 0x40 0x2 IRQ_TYPE_EDGE_BOTH>,
+					     <0x2 0x40 0x3 IRQ_TYPE_EDGE_BOTH>,
+					     <0x2 0x40 0x4 IRQ_TYPE_EDGE_BOTH>,
+					     <0x2 0x40 0x5
+							IRQ_TYPE_EDGE_RISING>,
+					     <0x2 0x40 0x6 IRQ_TYPE_EDGE_BOTH>,
+					     <0x2 0x40 0x7 IRQ_TYPE_EDGE_BOTH>;
+				interrupt-names = "soc-update",
+						  "soc-ready",
+						  "bsoc-delta",
+						  "msoc-delta",
+						  "msoc-low",
+						  "msoc-empty",
+						  "msoc-high",
+						  "msoc-full";
+			};
+
+			qcom,fg-batt-info@4100 {
+				status = "okay";
+				reg = <0x4100 0x100>;
+				interrupts = <0x2 0x41 0x0 IRQ_TYPE_EDGE_BOTH>,
+					     <0x2 0x41 0x1 IRQ_TYPE_EDGE_BOTH>,
+					     <0x2 0x41 0x2 IRQ_TYPE_EDGE_BOTH>,
+					     <0x2 0x41 0x3 IRQ_TYPE_EDGE_BOTH>,
+					     <0x2 0x41 0x6 IRQ_TYPE_EDGE_BOTH>;
+				interrupt-names = "vbatt-pred-delta",
+						  "vbatt-low",
+						  "esr-delta",
+						  "batt-missing",
+						  "batt-temp-delta";
+			};
+
+			qcom,fg-memif@4400 {
+				status = "okay";
+				reg = <0x4400 0x100>;
+				interrupts = <0x2 0x44 0x0 IRQ_TYPE_EDGE_BOTH>,
+					     <0x2 0x44 0x1 IRQ_TYPE_EDGE_BOTH>,
+					     <0x2 0x44 0x2 IRQ_TYPE_EDGE_BOTH>;
+				interrupt-names = "ima-rdy",
+						  "mem-xcp",
+						  "dma-grant";
+			};
+		};
 	};
 
 	qcom,pmfalcon@1 {
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-cdp.dts b/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-cdp.dts
index ac564d700cd8..73bf279052e3 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-cdp.dts
+++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-cdp.dts
@@ -22,3 +22,7 @@
 	compatible = "qcom,msmcobalt-cdp", "qcom,msmcobalt", "qcom,cdp";
 	qcom,board-id = <1 1>;
 };
+
+&pmfalcon_charger {
+	qcom,batteryless-platform;
+};
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-mtp.dts b/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-mtp.dts
index aaa56ea2f492..7807a13489d1 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-mtp.dts
+++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-mtp.dts
@@ -22,3 +22,7 @@
 	compatible = "qcom,msmcobalt-mtp", "qcom,msmcobalt", "qcom,mtp";
 	qcom,board-id = <8 2>;
 };
+
+&pmfalcon_fg {
+	qcom,battery-data = <&mtp_batterydata>;
+};
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-regulator.dtsi b/arch/arm/boot/dts/qcom/msmfalcon-regulator.dtsi
index cfe968a7310a..0ab76c273ac3 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon-regulator.dtsi
+++ b/arch/arm/boot/dts/qcom/msmfalcon-regulator.dtsi
@@ -440,6 +440,16 @@
 	};
 };
 
+&pmfalcon_charger {
+	smb2_vbus: qcom,smb2-vbus {
+		regulator-name = "smb2-vbus";
+	};
+
+	smb2_vconn: qcom,smb2-vconn {
+		regulator-name = "smb2-vconn";
+	};
+};
+
 /* Stub regulators */
 / {
 	/* GFX Supply */
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-rumi.dts b/arch/arm/boot/dts/qcom/msmfalcon-rumi.dts
index 1840221359e3..1575cea079ce 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon-rumi.dts
+++ b/arch/arm/boot/dts/qcom/msmfalcon-rumi.dts
@@ -94,3 +94,11 @@
 	compatible = "qcom,dummycc";
 	clock-output-names = "gcc_clocks";
 };
+
+&pmfalcon_charger {
+	status = "disabled";
+};
+
+&pmfalcon_fg {
+	status = "disabled";
+};
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-sim.dts b/arch/arm/boot/dts/qcom/msmfalcon-sim.dts
index 47759c9ce3ff..4e83266e884f 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon-sim.dts
+++ b/arch/arm/boot/dts/qcom/msmfalcon-sim.dts
@@ -73,3 +73,11 @@
 
 	status = "ok";
 };
+
+&pmfalcon_charger {
+	status = "disabled";
+};
+
+&pmfalcon_fg {
+	status = "disabled";
+};
diff --git a/arch/arm/boot/dts/qcom/msmfalcon.dtsi b/arch/arm/boot/dts/qcom/msmfalcon.dtsi
index 5b57ccfca435..5894fe81fe29 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msmfalcon.dtsi
@@ -877,6 +877,8 @@
 
 #include "msmfalcon-ion.dtsi"
 #include "msmfalcon-bus.dtsi"
+#include "msm-pmfalcon.dtsi"
+#include "msm-pm2falcon.dtsi"
 #include "msm-pmfalcon-rpm-regulator.dtsi"
 #include "msm-pm2falcon-rpm-regulator.dtsi"
 #include "msmfalcon-regulator.dtsi"
@@ -963,8 +965,6 @@
 	status = "ok";
 };
 
-#include "msm-pmfalcon.dtsi"
-#include "msm-pm2falcon.dtsi"
 #include "msm-arm-smmu-falcon.dtsi"
 #include "msm-arm-smmu-impl-defs-falcon.dtsi"
 #include "msmfalcon-common.dtsi"