97 files changed, 1232 insertions, 908 deletions

diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile
index 7810842100cd..730b76846c9d 100644
--- a/arch/arm/boot/dts/qcom/Makefile
+++ b/arch/arm/boot/dts/qcom/Makefile
@@ -102,34 +102,35 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
 	apq8096-v3-pmi8996-mdm9x55-slimbus-mtp.dtb \
 	apq8096-v3-pmi8996-dragonboard.dtb
 
-dtb-$(CONFIG_ARCH_MSMCOBALT) += msmcobalt-sim.dtb \
-	msmcobalt-rumi.dtb \
-	msmcobalt-cdp.dtb \
-	msmcobalt-mtp.dtb \
-	msmcobalt-qrd.dtb \
-	msmcobalt-v2-sim.dtb \
-	msmcobalt-v2-rumi.dtb \
-	msmcobalt-v2-mtp.dtb \
-	msmcobalt-v2-cdp.dtb \
-	msmcobalt-v2-qrd.dtb \
-	msmcobalt-qrd-skuk.dtb \
-	msmcobalt-v2-qrd-skuk.dtb \
-	msmcobalt-qrd-vr1.dtb \
-	msmcobalt-v2-qrd-vr1.dtb \
-	apqcobalt-mtp.dtb \
-	apqcobalt-cdp.dtb \
-	apqcobalt-v2-mtp.dtb \
-	apqcobalt-v2-cdp.dtb \
-	apqcobalt-v2-qrd.dtb \
-	msmcobalt-v2.1-mtp.dtb \
-	msmcobalt-v2.1-cdp.dtb \
-	msmcobalt-v2.1-qrd.dtb \
-	apqcobalt-v2.1-mtp.dtb \
-	apqcobalt-v2.1-cdp.dtb \
-	apqcobalt-v2.1-qrd.dtb \
-	msmcobalt-v2.1-interposer-msmfalcon-cdp.dtb \
-	msmcobalt-v2.1-interposer-msmfalcon-mtp.dtb \
-	msmcobalt-v2.1-interposer-msmfalcon-qrd.dtb
+dtb-$(CONFIG_ARCH_MSM8998) += msm8998-sim.dtb \
+	msm8998-rumi.dtb \
+	msm8998-cdp.dtb \
+	msm8998-mtp.dtb \
+	msm8998-qrd.dtb \
+	msm8998-v2-sim.dtb \
+	msm8998-v2-rumi.dtb \
+	msm8998-v2-mtp.dtb \
+	msm8998-v2-cdp.dtb \
+	msm8998-v2-qrd.dtb \
+	msm8998-qrd-skuk.dtb \
+	msm8998-v2-qrd-skuk.dtb \
+	msm8998-qrd-vr1.dtb \
+	msm8998-v2-qrd-vr1.dtb \
+	apq8998-mtp.dtb \
+	apq8998-cdp.dtb \
+	apq8998-v2-mtp.dtb \
+	apq8998-v2-cdp.dtb \
+	apq8998-v2-qrd.dtb \
+	msm8998-v2.1-mtp.dtb \
+	msm8998-v2.1-cdp.dtb \
+	msm8998-v2.1-qrd.dtb \
+	apq8998-v2.1-mtp.dtb \
+	apq8998-v2.1-cdp.dtb \
+	apq8998-v2.1-qrd.dtb \
+	apq8998-v2.1-mediabox.dtb \
+	msm8998-v2.1-interposer-msmfalcon-cdp.dtb \
+	msm8998-v2.1-interposer-msmfalcon-mtp.dtb \
+	msm8998-v2.1-interposer-msmfalcon-qrd.dtb
 
 dtb-$(CONFIG_ARCH_MSMHAMSTER) += msmhamster-rumi.dtb
 
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-cdp.dts b/arch/arm/boot/dts/qcom/apq8998-cdp.dts
index 1f0066d15aaa..8acd2dabe18a 100644
--- a/arch/arm/boot/dts/qcom/apqcobalt-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8998-cdp.dts
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apqcobalt.dtsi"
-#include "msmcobalt-cdp.dtsi"
+#include "apq8998.dtsi"
+#include "msm8998-cdp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ COBALT CDP";
-	compatible = "qcom,apqcobalt-cdp", "qcom,apqcobalt", "qcom,cdp";
+	model = "Qualcomm Technologies, Inc. APQ 8998 CDP";
+	compatible = "qcom,apq8998-cdp", "qcom,apq8998", "qcom,cdp";
 	qcom,board-id = <1 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-mtp.dts b/arch/arm/boot/dts/qcom/apq8998-mtp.dts
index b63e9e027797..5bed816f77d6 100644
--- a/arch/arm/boot/dts/qcom/apqcobalt-mtp.dts
+++ b/arch/arm/boot/dts/qcom/apq8998-mtp.dts
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apqcobalt.dtsi"
-#include "msmcobalt-mtp.dtsi"
+#include "apq8998.dtsi"
+#include "msm8998-mtp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ COBALT MTP";
-	compatible = "qcom,apqcobalt-mtp", "qcom,apqcobalt", "qcom,mtp";
+	model = "Qualcomm Technologies, Inc. APQ 8998 MTP";
+	compatible = "qcom,apq8998-mtp", "qcom,apq8998", "qcom,mtp";
 	qcom,board-id = <8 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-v2-cdp.dts b/arch/arm/boot/dts/qcom/apq8998-v2-cdp.dts
index 69eb9ef15c46..397892dbb540 100644
--- a/arch/arm/boot/dts/qcom/apqcobalt-v2-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8998-v2-cdp.dts
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apqcobalt-v2.dtsi"
-#include "msmcobalt-cdp.dtsi"
+#include "apq8998-v2.dtsi"
+#include "msm8998-cdp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ COBALT V2 CDP";
-	compatible = "qcom,apqcobalt-cdp", "qcom,apqcobalt", "qcom,cdp";
+	model = "Qualcomm Technologies, Inc. APQ 8998 V2 CDP";
+	compatible = "qcom,apq8998-cdp", "qcom,apq8998", "qcom,cdp";
 	qcom,board-id = <1 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-v2-mtp.dts b/arch/arm/boot/dts/qcom/apq8998-v2-mtp.dts
index 8587b56b289a..4dc735c8d182 100644
--- a/arch/arm/boot/dts/qcom/apqcobalt-v2-mtp.dts
+++ b/arch/arm/boot/dts/qcom/apq8998-v2-mtp.dts
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apqcobalt-v2.dtsi"
-#include "msmcobalt-mtp.dtsi"
+#include "apq8998-v2.dtsi"
+#include "msm8998-mtp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ COBALT V2 MTP";
-	compatible = "qcom,apqcobalt-mtp", "qcom,apqcobalt", "qcom,mtp";
+	model = "Qualcomm Technologies, Inc. APQ 8998 V2 MTP";
+	compatible = "qcom,apq8998-mtp", "qcom,apq8998", "qcom,mtp";
 	qcom,board-id = <8 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2-qrd.dts b/arch/arm/boot/dts/qcom/apq8998-v2-qrd.dts
index 81c17c2077e4..4f7efa7b4357 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2-qrd.dts
+++ b/arch/arm/boot/dts/qcom/apq8998-v2-qrd.dts
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "msmcobalt-v2.dtsi"
-#include "msmcobalt-qrd.dtsi"
+#include "apq8998-v2.dtsi"
+#include "msm8998-qrd.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT v2 QRD";
-	compatible = "qcom,msmcobalt-qrd", "qcom,msmcobalt", "qcom,qrd";
+	model = "Qualcomm Technologies, Inc. APQ 8998 V2 QRD";
+	compatible = "qcom,apq8998-qrd", "qcom,apq8998", "qcom,qrd";
 	qcom,board-id = <11 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-v2.1-cdp.dts b/arch/arm/boot/dts/qcom/apq8998-v2.1-cdp.dts
index f0ab8e0afc78..94c6031854fa 100644
--- a/arch/arm/boot/dts/qcom/apqcobalt-v2.1-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8998-v2.1-cdp.dts
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apqcobalt-v2.1.dtsi"
-#include "msmcobalt-cdp.dtsi"
+#include "apq8998-v2.1.dtsi"
+#include "msm8998-cdp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ COBALT V2.1 CDP";
-	compatible = "qcom,apqcobalt-cdp", "qcom,apqcobalt", "qcom,cdp";
+	model = "Qualcomm Technologies, Inc. APQ 8998 V2.1 CDP";
+	compatible = "qcom,apq8998-cdp", "qcom,apq8998", "qcom,cdp";
 	qcom,board-id = <1 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts b/arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts
new file mode 100644
index 000000000000..bc60d9a08c0b
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts
@@ -0,0 +1,30 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/dts-v1/;
+
+#include "apq8998-v2.1.dtsi"
+#include "msm8998-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. APQ 8998 V2.1 mediabox";
+	compatible = "qcom,apq8998-cdp", "qcom,apq8998", "qcom,cdp";
+	qcom,board-id = <8 1>;
+};
+
+&pil_modem {
+	status = "disabled";
+};
+
+&mdss_mdp {
+	qcom,mdss-pref-prim-intf = "hdmi";
+};
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-v2.1-mtp.dts b/arch/arm/boot/dts/qcom/apq8998-v2.1-mtp.dts
index e23134f8897b..fa4e28e515b5 100644
--- a/arch/arm/boot/dts/qcom/apqcobalt-v2.1-mtp.dts
+++ b/arch/arm/boot/dts/qcom/apq8998-v2.1-mtp.dts
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apqcobalt-v2.1.dtsi"
-#include "msmcobalt-mtp.dtsi"
+#include "apq8998-v2.1.dtsi"
+#include "msm8998-mtp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ COBALT V2.1 MTP";
-	compatible = "qcom,apqcobalt-mtp", "qcom,apqcobalt", "qcom,mtp";
+	model = "Qualcomm Technologies, Inc. APQ 8998 V2.1 MTP";
+	compatible = "qcom,apq8998-mtp", "qcom,apq8998", "qcom,mtp";
 	qcom,board-id = <8 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-v2-qrd.dts b/arch/arm/boot/dts/qcom/apq8998-v2.1-qrd.dts
index 5a26313f9d59..6a91b966a9b7 100644
--- a/arch/arm/boot/dts/qcom/apqcobalt-v2-qrd.dts
+++ b/arch/arm/boot/dts/qcom/apq8998-v2.1-qrd.dts
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apqcobalt-v2.dtsi"
-#include "msmcobalt-qrd.dtsi"
+#include "apq8998-v2.1.dtsi"
+#include "msm8998-qrd.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ COBALT V2 QRD";
-	compatible = "qcom,apqcobalt-qrd", "qcom,apqcobalt", "qcom,qrd";
+	model = "Qualcomm Technologies, Inc. APQ 8998 V2.1 QRD";
+	compatible = "qcom,apq8998-qrd", "qcom,apq8998", "qcom,qrd";
 	qcom,board-id = <11 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-v2.1.dtsi b/arch/arm/boot/dts/qcom/apq8998-v2.1.dtsi
index 5a49afecd60b..c7d44816c7d6 100644
--- a/arch/arm/boot/dts/qcom/apqcobalt-v2.1.dtsi
+++ b/arch/arm/boot/dts/qcom/apq8998-v2.1.dtsi
@@ -10,9 +10,9 @@
  * GNU General Public License for more details.
  */
 
-#include "msmcobalt-v2.1.dtsi"
+#include "msm8998-v2.1.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ COBALT V2.1";
+	model = "Qualcomm Technologies, Inc. APQ 8998 V2.1";
 	qcom,msm-id = <319 0x20001>;
 };
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-v2.dtsi b/arch/arm/boot/dts/qcom/apq8998-v2.dtsi
index 58abca9859d9..2be3db45bf37 100644
--- a/arch/arm/boot/dts/qcom/apqcobalt-v2.dtsi
+++ b/arch/arm/boot/dts/qcom/apq8998-v2.dtsi
@@ -10,9 +10,9 @@
  * GNU General Public License for more details.
  */
 
-#include "msmcobalt-v2.dtsi"
+#include "msm8998-v2.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ COBALT V2";
+	model = "Qualcomm Technologies, Inc. APQ 8998 V2";
 	qcom,msm-id = <319 0x20000>;
 };
diff --git a/arch/arm/boot/dts/qcom/apqcobalt.dtsi b/arch/arm/boot/dts/qcom/apq8998.dtsi
index dcc1601245f5..99d3459e39ce 100644
--- a/arch/arm/boot/dts/qcom/apqcobalt.dtsi
+++ b/arch/arm/boot/dts/qcom/apq8998.dtsi
@@ -10,10 +10,10 @@
  * GNU General Public License for more details.
  */
 
-#include "msmcobalt.dtsi"
+#include "msm8998.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ COBALT";
+	model = "Qualcomm Technologies, Inc. APQ 8998";
 	qcom,msm-id = <319 0x10000>;
 };
 
diff --git a/arch/arm/boot/dts/qcom/batterydata-qrd-skuk-4v4-3000mah.dtsi b/arch/arm/boot/dts/qcom/batterydata-qrd-skuk-4v4-3000mah.dtsi
index 8bf98d83d381..ba3b33361ba1 100644
--- a/arch/arm/boot/dts/qcom/batterydata-qrd-skuk-4v4-3000mah.dtsi
+++ b/arch/arm/boot/dts/qcom/batterydata-qrd-skuk-4v4-3000mah.dtsi
@@ -10,12 +10,12 @@
  * GNU General Public License for more details.
  */
 
-qcom,qrd_msmcobalt_skuk_3000mah {
+qcom,qrd_msm8998_skuk_3000mah {
 	qcom,max-voltage-uv = <4400000>;
 	qcom,nom-batt-capacity-mah = <3000>;
 	qcom,batt-id-kohm = <68>;
 	qcom,battery-beta = <3380>;
-	qcom,battery-type = "qrd_msmcobalt_skuk_300mah";
+	qcom,battery-type = "qrd_msm8998_skuk_300mah";
 	qcom,checksum = <0x0F19>;
 	qcom,fg-profile-data = [
 		 6F 1F B2 05
diff --git a/arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi b/arch/arm/boot/dts/qcom/msm-arm-smmu-8998.dtsi
index 1ad8f99e4186..0ba86e81887f 100644
--- a/arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-arm-smmu-8998.dtsi
@@ -10,7 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include <dt-bindings/clock/msm-clocks-cobalt.h>
+#include <dt-bindings/clock/msm-clocks-8998.h>
 #include <dt-bindings/msm/msm-bus-ids.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
diff --git a/arch/arm/boot/dts/qcom/msm-arm-smmu-impl-defs-cobalt.dtsi b/arch/arm/boot/dts/qcom/msm-arm-smmu-impl-defs-8998.dtsi
index 4fbf1e126842..4fbf1e126842 100644
--- a/arch/arm/boot/dts/qcom/msm-arm-smmu-impl-defs-cobalt.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-arm-smmu-impl-defs-8998.dtsi
diff --git a/arch/arm/boot/dts/qcom/msm-gdsc-cobalt.dtsi b/arch/arm/boot/dts/qcom/msm-gdsc-8998.dtsi
index c86351e48d5f..c86351e48d5f 100644
--- a/arch/arm/boot/dts/qcom/msm-gdsc-cobalt.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-gdsc-8998.dtsi
diff --git a/arch/arm/boot/dts/qcom/msm-pmcobalt-rpm-regulator.dtsi b/arch/arm/boot/dts/qcom/msm-pm8998-rpm-regulator.dtsi
index 7243a6b1d6d4..5ad84dbfcff6 100644
--- a/arch/arm/boot/dts/qcom/msm-pmcobalt-rpm-regulator.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-pm8998-rpm-regulator.dtsi
@@ -11,7 +11,7 @@
  */
 
 &rpm_bus {
-	/* PMCOBALT S1 + S6 = VDD_CX supply */
+	/* PM8998 S1 + S6 = VDD_CX supply */
 	rpm-regulator-smpa1 {
 		compatible = "qcom,rpm-smd-regulator-resource";
 		qcom,resource-name = "rwcx";
@@ -21,7 +21,7 @@
 
 		regulator-s1 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s1";
+			regulator-name = "pm8998_s1";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -36,7 +36,7 @@
 
 		regulator-s2 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s2";
+			regulator-name = "pm8998_s2";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -51,7 +51,7 @@
 
 		regulator-s3 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s3";
+			regulator-name = "pm8998_s3";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -66,7 +66,7 @@
 
 		regulator-s4 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s4";
+			regulator-name = "pm8998_s4";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -81,7 +81,7 @@
 
 		regulator-s5 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s5";
+			regulator-name = "pm8998_s5";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -96,7 +96,7 @@
 
 		regulator-s7 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s7";
+			regulator-name = "pm8998_s7";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -111,13 +111,13 @@
 
 		regulator-s8 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s8";
+			regulator-name = "pm8998_s8";
 			qcom,set = <3>;
 			status = "disabled";
 		};
 	};
 
-	/* PMCOBALT S9 = VDD_MX supply */
+	/* PM8998 S9 = VDD_MX supply */
 	rpm-regulator-smpa9 {
 		compatible = "qcom,rpm-smd-regulator-resource";
 		qcom,resource-name = "rwmx";
@@ -127,7 +127,7 @@
 
 		regulator-s9 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s9";
+			regulator-name = "pm8998_s9";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -142,7 +142,7 @@
 
 		regulator-l1 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l1";
+			regulator-name = "pm8998_l1";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -157,7 +157,7 @@
 
 		regulator-l2 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l2";
+			regulator-name = "pm8998_l2";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -172,7 +172,7 @@
 
 		regulator-l3 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l3";
+			regulator-name = "pm8998_l3";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -187,7 +187,7 @@
 
 		regulator-l4 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l4";
+			regulator-name = "pm8998_l4";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -202,7 +202,7 @@
 
 		regulator-l5 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l5";
+			regulator-name = "pm8998_l5";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -217,7 +217,7 @@
 
 		regulator-l6 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l6";
+			regulator-name = "pm8998_l6";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -232,7 +232,7 @@
 
 		regulator-l7 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l7";
+			regulator-name = "pm8998_l7";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -247,7 +247,7 @@
 
 		regulator-l8 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l8";
+			regulator-name = "pm8998_l8";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -262,7 +262,7 @@
 
 		regulator-l9 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l9";
+			regulator-name = "pm8998_l9";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -277,7 +277,7 @@
 
 		regulator-l10 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l10";
+			regulator-name = "pm8998_l10";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -292,7 +292,7 @@
 
 		regulator-l11 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l11";
+			regulator-name = "pm8998_l11";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -307,7 +307,7 @@
 
 		regulator-l12 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l12";
+			regulator-name = "pm8998_l12";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -322,7 +322,7 @@
 
 		regulator-l13 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l13";
+			regulator-name = "pm8998_l13";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -337,7 +337,7 @@
 
 		regulator-l14 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l14";
+			regulator-name = "pm8998_l14";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -352,7 +352,7 @@
 
 		regulator-l15 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l15";
+			regulator-name = "pm8998_l15";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -367,7 +367,7 @@
 
 		regulator-l16 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l16";
+			regulator-name = "pm8998_l16";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -382,7 +382,7 @@
 
 		regulator-l17 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l17";
+			regulator-name = "pm8998_l17";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -397,7 +397,7 @@
 
 		regulator-l18 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l18";
+			regulator-name = "pm8998_l18";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -412,7 +412,7 @@
 
 		regulator-l19 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l19";
+			regulator-name = "pm8998_l19";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -427,7 +427,7 @@
 
 		regulator-l20 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l20";
+			regulator-name = "pm8998_l20";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -442,7 +442,7 @@
 
 		regulator-l21 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l21";
+			regulator-name = "pm8998_l21";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -457,7 +457,7 @@
 
 		regulator-l22 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l22";
+			regulator-name = "pm8998_l22";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -472,7 +472,7 @@
 
 		regulator-l23 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l23";
+			regulator-name = "pm8998_l23";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -487,7 +487,7 @@
 
 		regulator-l24 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l24";
+			regulator-name = "pm8998_l24";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -502,7 +502,7 @@
 
 		regulator-l25 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l25";
+			regulator-name = "pm8998_l25";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -517,7 +517,7 @@
 
 		regulator-l26 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l26";
+			regulator-name = "pm8998_l26";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -532,7 +532,7 @@
 
 		regulator-l27 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l27";
+			regulator-name = "pm8998_l27";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -547,7 +547,7 @@
 
 		regulator-l28 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l28";
+			regulator-name = "pm8998_l28";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -562,7 +562,7 @@
 
 		regulator-lvs1 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_lvs1";
+			regulator-name = "pm8998_lvs1";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -577,7 +577,7 @@
 
 		regulator-lvs2 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_lvs2";
+			regulator-name = "pm8998_lvs2";
 			qcom,set = <3>;
 			status = "disabled";
 		};
@@ -592,7 +592,7 @@
 
 		regulator-bob {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmicobalt_bob";
+			regulator-name = "pm8998_bob";
 			qcom,set = <3>;
 			status = "disabled";
 		};
diff --git a/arch/arm/boot/dts/qcom/msm-pmcobalt.dtsi b/arch/arm/boot/dts/qcom/msm-pm8998.dtsi
index eb5208a8d983..e91fc68d2c52 100644
--- a/arch/arm/boot/dts/qcom/msm-pmcobalt.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-pm8998.dtsi
@@ -14,13 +14,13 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 
 &spmi_bus {
-	qcom,pmcobalt@0 {
+	qcom,pm8998@0 {
 		compatible ="qcom,spmi-pmic";
 		reg = <0x0 SPMI_USID>;
 		#address-cells = <2>;
 		#size-cells = <0>;
 
-		pmcobalt_revid: qcom,revid@100 {
+		pm8998_revid: qcom,revid@100 {
 			compatible = "qcom,qpnp-revid";
 			reg = <0x100 0x100>;
 		};
@@ -69,18 +69,18 @@
 			compatible = "qcom,qpnp-temp-alarm";
 			reg = <0x2400 0x100>;
 			interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_RISING>;
-			label = "pmcobalt_tz";
+			label = "pm8998_tz";
 			qcom,channel-num = <6>;
-			qcom,temp_alarm-vadc = <&pmcobalt_vadc>;
+			qcom,temp_alarm-vadc = <&pm8998_vadc>;
 		};
 
-		pmcobalt_gpios: gpios {
+		pm8998_gpios: gpios {
 			compatible = "qcom,qpnp-pin";
 			gpio-controller;
 			#gpio-cells = <2>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			label = "pmcobalt-gpio";
+			label = "pm8998-gpio";
 
 			gpio@c000 {
 				reg = <0xc000 0x100>;
@@ -239,28 +239,28 @@
 			};
 		};
 
-		pmcobalt_coincell: qcom,coincell@2800 {
+		pm8998_coincell: qcom,coincell@2800 {
 			compatible = "qcom,qpnp-coincell";
 			reg = <0x2800 0x100>;
 		};
 
-		pmcobalt_rtc: qcom,pmcobalt_rtc {
+		pm8998_rtc: qcom,pm8998_rtc {
 			compatible = "qcom,qpnp-rtc";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			qcom,qpnp-rtc-write = <0>;
 			qcom,qpnp-rtc-alarm-pwrup = <0>;
 
-			qcom,pmcobalt_rtc_rw@6000 {
+			qcom,pm8998_rtc_rw@6000 {
 				reg = <0x6000 0x100>;
 			};
-			qcom,pmcobalt_rtc_alarm@6100 {
+			qcom,pm8998_rtc_alarm@6100 {
 				reg = <0x6100 0x100>;
 				interrupts = <0x0 0x61 0x1 IRQ_TYPE_NONE>;
 			};
 		};
 
-		pmcobalt_vadc: vadc@3100 {
+		pm8998_vadc: vadc@3100 {
 			compatible = "qcom,qpnp-vadc-hc";
 			reg = <0x3100 0x100>;
 			#address-cells = <1>;
@@ -307,7 +307,7 @@
 			};
 		};
 
-		pmcobalt_adc_tm: vadc@3400 {
+		pm8998_adc_tm: vadc@3400 {
 			compatible = "qcom,qpnp-adc-tm-hc";
 			reg = <0x3400 0x100>;
 			#address-cells = <1>;
@@ -316,13 +316,13 @@
 			interrupt-names = "eoc-int-en-set";
 			qcom,adc-bit-resolution = <15>;
 			qcom,adc-vdd-reference = <1875>;
-			qcom,adc_tm-vadc = <&pmcobalt_vadc>;
+			qcom,adc_tm-vadc = <&pm8998_vadc>;
 			qcom,decimation = <0>;
 			qcom,fast-avg-setup = <0>;
 		};
 	};
 
-	qcom,pmcobalt@1 {
+	qcom,pm8998@1 {
 		compatible ="qcom,spmi-pmic";
 		reg = <0x1 SPMI_USID>;
 		#address-cells = <2>;
diff --git a/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi b/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi
index baeda86bc976..725c129a28da 100644
--- a/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-pmi8998.dtsi
@@ -14,13 +14,13 @@
 #include <dt-bindings/spmi/spmi.h>
 
 &spmi_bus {
-	qcom,pmicobalt@2 {
+	qcom,pmi8998@2 {
 		compatible = "qcom,spmi-pmic";
 		reg = <0x2 SPMI_USID>;
 		#address-cells = <2>;
 		#size-cells = <0>;
 
-		pmicobalt_revid: qcom,revid@100 {
+		pmi8998_revid: qcom,revid@100 {
 			compatible = "qcom,qpnp-revid";
 			reg = <0x100 0x100>;
 			qcom,fab-id-valid;
@@ -35,16 +35,16 @@
 			compatible = "qcom,qpnp-temp-alarm";
 			reg = <0x2400 0x100>;
 			interrupts = <0x2 0x24 0x0 IRQ_TYPE_EDGE_RISING>;
-			label = "pmicobalt_tz";
+			label = "pmi8998_tz";
 		};
 
-		pmicobalt_gpios: gpios {
+		pmi8998_gpios: gpios {
 			compatible = "qcom,qpnp-pin";
 			gpio-controller;
 			#gpio-cells = <2>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			label = "pmicobalt-gpio";
+			label = "pmi8998-gpio";
 
 			gpio@c000 {
 				reg = <0xc000 0x100>;
@@ -136,20 +136,20 @@
 			reg = <0x1500 0x100>;
 			interrupts = <0x2 0x15 0x0 IRQ_TYPE_NONE>;
 			interrupt-names = "ptrain-done";
-			qcom,pmic-revid = <&pmicobalt_revid>;
+			qcom,pmic-revid = <&pmi8998_revid>;
 		};
 
-		pmicobalt_charger: qcom,qpnp-smb2 {
+		pmi8998_charger: qcom,qpnp-smb2 {
 			compatible = "qcom,qpnp-smb2";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			qcom,pmic-revid = <&pmicobalt_revid>;
+			qcom,pmic-revid = <&pmi8998_revid>;
 
-			io-channels = <&pmicobalt_rradc 8>,
-				      <&pmicobalt_rradc 10>,
-				      <&pmicobalt_rradc 3>,
-				      <&pmicobalt_rradc 4>;
+			io-channels = <&pmi8998_rradc 8>,
+				      <&pmi8998_rradc 10>,
+				      <&pmi8998_rradc 3>,
+				      <&pmi8998_rradc 4>;
 			io-channel-names = "charger_temp",
 					   "charger_temp_max",
 					   "usbin_i",
@@ -268,10 +268,10 @@
 			};
 		};
 
-		pmicobalt_pdphy: qcom,usb-pdphy@1700 {
+		pmi8998_pdphy: qcom,usb-pdphy@1700 {
 			compatible = "qcom,qpnp-pdphy";
 			reg = <0x1700 0x100>;
-			vdd-pdphy-supply = <&pmcobalt_l24>;
+			vdd-pdphy-supply = <&pm8998_l24>;
 			vbus-supply = <&smb2_vbus>;
 			vconn-supply = <&smb2_vconn>;
 			interrupts = <0x2 0x17 0x0 IRQ_TYPE_EDGE_RISING>,
@@ -305,21 +305,21 @@
 			qcom,ibat-polling-delay-ms = <100>;
 		};
 
-		pmicobalt_rradc: rradc@4500 {
+		pmi8998_rradc: rradc@4500 {
 			compatible = "qcom,rradc";
 			reg = <0x4500 0x100>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			#io-channel-cells = <1>;
-			qcom,pmic-revid = <&pmicobalt_revid>;
+			qcom,pmic-revid = <&pmi8998_revid>;
 		};
 
-		pmicobalt_fg: qpnp,fg {
+		pmi8998_fg: qpnp,fg {
 			compatible = "qcom,fg-gen3";
 			#address-cells = <1>;
 			#size-cells = <1>;
-			qcom,pmic-revid = <&pmicobalt_revid>;
-			io-channels = <&pmicobalt_rradc 0>;
+			qcom,pmic-revid = <&pmi8998_revid>;
+			io-channels = <&pmi8998_rradc 0>;
 			io-channel-names = "rradc_batt_id";
 			qcom,fg-esr-timer-awake = <96>;
 			qcom,fg-esr-timer-asleep = <256>;
@@ -376,13 +376,13 @@
 		};
 	};
 
-	qcom,pmicobalt@3 {
+	qcom,pmi8998@3 {
 		compatible ="qcom,spmi-pmic";
 		reg = <0x3 SPMI_USID>;
 		#address-cells = <2>;
 		#size-cells = <0>;
 
-		pmicobalt_pwm_1: pwm@b100 {
+		pmi8998_pwm_1: pwm@b100 {
 			compatible = "qcom,qpnp-pwm";
 			reg = <0xb100 0x100>,
 			      <0xb042 0x7e>;
@@ -396,7 +396,7 @@
 			status = "disabled";
 		};
 
-		pmicobalt_pwm_2: pwm@b200 {
+		pmi8998_pwm_2: pwm@b200 {
 			compatible = "qcom,qpnp-pwm";
 			reg = <0xb200 0x100>,
 			      <0xb042 0x7e>;
@@ -410,7 +410,7 @@
 			status = "disabled";
 		};
 
-		pmicobalt_pwm_3: pwm@b300 {
+		pmi8998_pwm_3: pwm@b300 {
 			compatible = "qcom,qpnp-pwm";
 			reg = <0xb300 0x100>,
 			      <0xb042 0x7e>;
@@ -423,7 +423,7 @@
 			#pwm-cells = <2>;
 		};
 
-		pmicobalt_pwm_4: pwm@b400 {
+		pmi8998_pwm_4: pwm@b400 {
 			compatible = "qcom,qpnp-pwm";
 			reg = <0xb400 0x100>,
 			      <0xb042 0x7e>;
@@ -436,7 +436,7 @@
 			#pwm-cells = <2>;
 		};
 
-		pmicobalt_pwm_5: pwm@b500 {
+		pmi8998_pwm_5: pwm@b500 {
 			compatible = "qcom,qpnp-pwm";
 			reg = <0xb500 0x100>,
 			      <0xb042 0x7e>;
@@ -449,7 +449,7 @@
 			#pwm-cells = <2>;
 		};
 
-		pmicobalt_pwm_6: pwm@b600 {
+		pmi8998_pwm_6: pwm@b600 {
 			compatible = "qcom,qpnp-pwm";
 			reg = <0xb600 0x100>,
 			      <0xb042 0x7e>;
@@ -473,7 +473,7 @@
 				label = "rgb";
 				qcom,id = <3>;
 				qcom,mode = "pwm";
-				pwms = <&pmicobalt_pwm_5 0 0>;
+				pwms = <&pmi8998_pwm_5 0 0>;
 				qcom,pwm-us = <1000>;
 				qcom,max-current = <12>;
 				qcom,default-state = "off";
@@ -486,7 +486,7 @@
 				label = "rgb";
 				qcom,id = <4>;
 				qcom,mode = "pwm";
-				pwms = <&pmicobalt_pwm_4 0 0>;
+				pwms = <&pmi8998_pwm_4 0 0>;
 				qcom,pwm-us = <1000>;
 				qcom,max-current = <12>;
 				qcom,default-state = "off";
@@ -498,7 +498,7 @@
 				label = "rgb";
 				qcom,id = <5>;
 				qcom,mode = "pwm";
-				pwms = <&pmicobalt_pwm_3 0 0>;
+				pwms = <&pmi8998_pwm_3 0 0>;
 				qcom,pwm-us = <1000>;
 				qcom,max-current = <12>;
 				qcom,default-state = "off";
@@ -511,7 +511,7 @@
 			compatible = "qcom,qpnp-labibb-regulator";
 			#address-cells = <1>;
 			#size-cells = <1>;
-			qcom,pmic-revid = <&pmicobalt_revid>;
+			qcom,pmic-revid = <&pmi8998_revid>;
 			status = "disabled";
 
 			ibb_regulator: qcom,ibb@dc00 {
@@ -582,7 +582,7 @@
 			};
 		};
 
-		pmicobalt_wled: qcom,leds@d800 {
+		pmi8998_wled: qcom,leds@d800 {
 			compatible = "qcom,qpnp-wled";
 			reg = <0xd800 0x100>,
 				<0xd900 0x100>,
@@ -612,11 +612,11 @@
 			qcom,en-phase-stag;
 			qcom,led-strings-list = [00 01 02 03];
 			qcom,en-ext-pfet-sc-pro;
-			qcom,pmic-revid = <&pmicobalt_revid>;
+			qcom,pmic-revid = <&pmi8998_revid>;
 			qcom,loop-auto-gm-en;
 		};
 
-		pmicobalt_haptics: qcom,haptic@c000 {
+		pmi8998_haptics: qcom,haptic@c000 {
 			status = "disabled";
 			compatible = "qcom,qpnp-haptic";
 			reg = <0xc000 0x100>;
@@ -658,9 +658,9 @@
 			qcom,thermal-derate-en;
 			qcom,thermal-derate-current = <200 500 1000>;
 			qcom,isc-delay = <192>;
-			qcom,pmic-revid = <&pmicobalt_revid>;
+			qcom,pmic-revid = <&pmi8998_revid>;
 
-			pmicobalt_flash0: qcom,flash_0 {
+			pmi8998_flash0: qcom,flash_0 {
 				label = "flash";
 				qcom,led-name = "led:flash_0";
 				qcom,max-current = <1500>;
@@ -673,7 +673,7 @@
 				qcom,hdrm-vol-hi-lo-win-mv = <100>;
 			};
 
-			pmicobalt_flash1: qcom,flash_1 {
+			pmi8998_flash1: qcom,flash_1 {
 				label = "flash";
 				qcom,led-name = "led:flash_1";
 				qcom,max-current = <1500>;
@@ -686,7 +686,7 @@
 				qcom,hdrm-vol-hi-lo-win-mv = <100>;
 			};
 
-			pmicobalt_flash2: qcom,flash_2 {
+			pmi8998_flash2: qcom,flash_2 {
 				label = "flash";
 				qcom,led-name = "led:flash_2";
 				qcom,max-current = <750>;
@@ -702,7 +702,7 @@
 				pinctrl-1 = <&led_disable>;
 			};
 
-			pmicobalt_torch0: qcom,torch_0 {
+			pmi8998_torch0: qcom,torch_0 {
 				label = "torch";
 				qcom,led-name = "led:torch_0";
 				qcom,max-current = <500>;
@@ -714,7 +714,7 @@
 				qcom,hdrm-vol-hi-lo-win-mv = <100>;
 			};
 
-			pmicobalt_torch1: qcom,torch_1 {
+			pmi8998_torch1: qcom,torch_1 {
 				label = "torch";
 				qcom,led-name = "led:torch_1";
 				qcom,max-current = <500>;
@@ -726,7 +726,7 @@
 				qcom,hdrm-vol-hi-lo-win-mv = <100>;
 			};
 
-			pmicobalt_torch2: qcom,torch_2 {
+			pmi8998_torch2: qcom,torch_2 {
 				label = "torch";
 				qcom,led-name = "led:torch_2";
 				qcom,max-current = <500>;
@@ -741,14 +741,14 @@
 				pinctrl-1 = <&led_disable>;
 			};
 
-			pmicobalt_switch0: qcom,led_switch_0 {
+			pmi8998_switch0: qcom,led_switch_0 {
 				label = "switch";
 				qcom,led-name = "led:switch_0";
 				qcom,led-mask = <3>;
 				qcom,default-led-trigger = "switch0_trigger";
 			};
 
-			pmicobalt_switch1: qcom,led_switch_1 {
+			pmi8998_switch1: qcom,led_switch_1 {
 				label = "switch";
 				qcom,led-name = "led:switch_1";
 				qcom,led-mask = <4>;
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi b/arch/arm/boot/dts/qcom/msm8998-audio.dtsi
index ca12a520c2aa..506e37c2349a 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-audio.dtsi
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-#include "msmcobalt-wsa881x.dtsi"
+#include "msm8998-wsa881x.dtsi"
 
 &msm_audio_ion {
 	qcom,smmu-version = <2>;
@@ -32,8 +32,8 @@
 	};
 
 	sound-9335 {
-		compatible = "qcom,msmcobalt-asoc-snd-tasha";
-		qcom,model = "msmcobalt-tasha-snd-card";
+		compatible = "qcom,msm8998-asoc-snd-tasha";
+		qcom,model = "msm8998-tasha-snd-card";
 		qcom,ext-disp-audio-rx;
 		qcom,wcn-btfm;
 		qcom,mi2s-audio-intf;
@@ -145,8 +145,8 @@
 	};
 
 	sound-tavil {
-		compatible = "qcom,msmcobalt-asoc-snd-tavil";
-		qcom,model = "msmcobalt-tavil-snd-card";
+		compatible = "qcom,msm8998-asoc-snd-tavil";
+		qcom,model = "msm8998-tavil-snd-card";
 		qcom,ext-disp-audio-rx;
 		qcom,wcn-btfm;
 		qcom,mi2s-audio-intf;
@@ -294,7 +294,7 @@
 	clock_audio: audio_ext_clk {
 		status = "ok";
 		compatible = "qcom,audio-ref-clk";
-		qcom,audio-ref-clk-gpio = <&pmcobalt_gpios 13 0>;
+		qcom,audio-ref-clk-gpio = <&pm8998_gpios 13 0>;
 		clock-names = "osr_clk";
 		clocks = <&clock_gcc clk_div_clk1>;
 		qcom,node_has_rpm_clock;
@@ -347,23 +347,23 @@
 		clocks = <&clock_audio clk_audio_pmi_clk>,
 			 <&clock_audio clk_audio_ap_clk2>;
 
-		cdc-vdd-buck-supply = <&pmcobalt_s4>;
+		cdc-vdd-buck-supply = <&pm8998_s4>;
 		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;
 		qcom,cdc-vdd-buck-current = <650000>;
 
-		cdc-buck-sido-supply = <&pmcobalt_s4>;
+		cdc-buck-sido-supply = <&pm8998_s4>;
 		qcom,cdc-buck-sido-voltage = <1800000 1800000>;
 		qcom,cdc-buck-sido-current = <250000>;
 
-		cdc-vdd-tx-h-supply = <&pmcobalt_s4>;
+		cdc-vdd-tx-h-supply = <&pm8998_s4>;
 		qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;
 		qcom,cdc-vdd-tx-h-current = <25000>;
 
-		cdc-vdd-rx-h-supply = <&pmcobalt_s4>;
+		cdc-vdd-rx-h-supply = <&pm8998_s4>;
 		qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;
 		qcom,cdc-vdd-rx-h-current = <25000>;
 
-		cdc-vddpx-1-supply = <&pmcobalt_s4>;
+		cdc-vddpx-1-supply = <&pm8998_s4>;
 		qcom,cdc-vddpx-1-voltage = <1800000 1800000>;
 		qcom,cdc-vddpx-1-current = <10000>;
 
@@ -400,23 +400,23 @@
 		clock-names = "wcd_clk";
 		clocks = <&clock_audio_lnbb clk_audio_pmi_lnbb_clk>;
 
-		cdc-vdd-buck-supply = <&pmcobalt_s4>;
+		cdc-vdd-buck-supply = <&pm8998_s4>;
 		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;
 		qcom,cdc-vdd-buck-current = <650000>;
 
-		cdc-buck-sido-supply = <&pmcobalt_s4>;
+		cdc-buck-sido-supply = <&pm8998_s4>;
 		qcom,cdc-buck-sido-voltage = <1800000 1800000>;
 		qcom,cdc-buck-sido-current = <250000>;
 
-		cdc-vdd-tx-h-supply = <&pmcobalt_s4>;
+		cdc-vdd-tx-h-supply = <&pm8998_s4>;
 		qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;
 		qcom,cdc-vdd-tx-h-current = <25000>;
 
-		cdc-vdd-rx-h-supply = <&pmcobalt_s4>;
+		cdc-vdd-rx-h-supply = <&pm8998_s4>;
 		qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;
 		qcom,cdc-vdd-rx-h-current = <25000>;
 
-		cdc-vddpx-1-supply = <&pmcobalt_s4>;
+		cdc-vddpx-1-supply = <&pm8998_s4>;
 		qcom,cdc-vddpx-1-voltage = <1800000 1800000>;
 		qcom,cdc-vddpx-1-current = <10000>;
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-blsp.dtsi b/arch/arm/boot/dts/qcom/msm8998-blsp.dtsi
index a660ea06795e..b9e323d894c3 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-blsp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-blsp.dtsi
@@ -39,7 +39,7 @@
 	};
 };
 
-#include "msmcobalt-pinctrl.dtsi"
+#include "msm8998-pinctrl.dtsi"
 
 &soc {
 	dma_blsp1: qcom,sps-dma@0xc144000 { /* BLSP1 */
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-bus.dtsi b/arch/arm/boot/dts/qcom/msm8998-bus.dtsi
index edf7e7b9cbb0..edf7e7b9cbb0 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-bus.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-bus.dtsi
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8998-camera-sensor-cdp.dtsi
index ed8eb8459e51..61fc31a17e52 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-camera-sensor-cdp.dtsi
@@ -15,18 +15,18 @@
 	led_flash0: qcom,camera-flash@0 {
 		cell-index = <0>;
 		compatible = "qcom,camera-flash";
-		qcom,flash-source = <&pmicobalt_flash0 &pmicobalt_flash1>;
-		qcom,torch-source = <&pmicobalt_torch0 &pmicobalt_torch1>;
-		qcom,switch-source = <&pmicobalt_switch0>;
+		qcom,flash-source = <&pmi8998_flash0 &pmi8998_flash1>;
+		qcom,torch-source = <&pmi8998_torch0 &pmi8998_torch1>;
+		qcom,switch-source = <&pmi8998_switch0>;
 		status = "ok";
 	};
 
 	led_flash1: qcom,camera-flash@1 {
 		cell-index = <1>;
 		compatible = "qcom,camera-flash";
-		qcom,flash-source = <&pmicobalt_flash2>;
-		qcom,torch-source = <&pmicobalt_torch2>;
-		qcom,switch-source = <&pmicobalt_switch1>;
+		qcom,flash-source = <&pmi8998_flash2>;
+		qcom,torch-source = <&pmi8998_torch2>;
+		qcom,switch-source = <&pmi8998_switch1>;
 		status = "ok";
 	};
 };
@@ -82,9 +82,9 @@
 		cell-index = <0>;
 		reg = <0>;
 		compatible = "qcom,eeprom";
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage = <0 3312000 1352000>;
 		qcom,cam-vreg-max-voltage = <0 3600000 1352000>;
@@ -99,7 +99,7 @@
 				&cam_actuator_vaf_suspend>;
 		gpios = <&tlmm 13 0>,
 			<&tlmm 30 0>,
-			<&pmcobalt_gpios 20 0>,
+			<&pm8998_gpios 20 0>,
 			<&tlmm 29 0>,
 			<&tlmm 27 0>;
 		qcom,gpio-reset = <1>;
@@ -127,9 +127,9 @@
 		cell-index = <1>;
 		reg = <0x1>;
 		compatible = "qcom,eeprom";
-		cam_vdig-supply = <&pmcobalt_lvs1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
+		cam_vdig-supply = <&pm8998_lvs1>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
 		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
 		qcom,cam-vreg-min-voltage = <0 0 3312000>;
 		qcom,cam-vreg-max-voltage = <0 0 3600000>;
@@ -164,9 +164,9 @@
 		cell-index = <2>;
 		reg = <0x2>;
 		compatible = "qcom,eeprom";
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmcobalt_l22>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pm8998_l22>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage =
 			<0 2864000 1352000>;
@@ -181,7 +181,7 @@
 				 &cam_sensor_front_suspend>;
 		gpios = <&tlmm 14 0>,
 			<&tlmm 28 0>,
-			<&pmcobalt_gpios 9 0>;
+			<&pm8998_gpios 9 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
 		qcom,gpio-req-tbl-num = <0 1 2>;
@@ -210,9 +210,9 @@
 		qcom,actuator-src = <&actuator0>;
 		qcom,ois-src = <&ois0>;
 		qcom,eeprom-src = <&eeprom0>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage = <0 3312000 1352000>;
 		qcom,cam-vreg-max-voltage = <0 3600000 1352000>;
@@ -225,7 +225,7 @@
 				 &cam_sensor_rear_suspend>;
 		gpios = <&tlmm 13 0>,
 			<&tlmm 30 0>,
-			<&pmcobalt_gpios 20 0>,
+			<&pm8998_gpios 20 0>,
 			<&tlmm 29 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
@@ -254,9 +254,9 @@
 		qcom,csid-sd-index = <1>;
 		qcom,mount-angle = <90>;
 		qcom,eeprom-src = <&eeprom1>;
-		cam_vdig-supply = <&pmcobalt_lvs1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
+		cam_vdig-supply = <&pm8998_lvs1>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
 		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
 		qcom,cam-vreg-min-voltage = <0 0 3312000>;
 		qcom,cam-vreg-max-voltage = <0 0 3600000>;
@@ -297,9 +297,9 @@
 		qcom,eeprom-src = <&eeprom2>;
 		qcom,led-flash-src = <&led_flash1>;
 		qcom,actuator-src = <&actuator1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmcobalt_l22>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pm8998_l22>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage =
 			<0 2864000 1352000>;
@@ -314,7 +314,7 @@
 				 &cam_sensor_front_suspend>;
 		gpios = <&tlmm 14 0>,
 			<&tlmm 28 0>,
-			<&pmcobalt_gpios 9 0>;
+			<&pm8998_gpios 9 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
 		qcom,gpio-req-tbl-num = <0 1 2>;
@@ -332,7 +332,7 @@
 		qcom,clock-rates = <24000000 0>;
 	};
 };
-&pmcobalt_gpios {
+&pm8998_gpios {
 	gpio@c800 { /* GPIO 9 - CAMERA SENSOR 2 VDIG */
 		qcom,mode = <1>;		/* Output */
 		qcom,pull = <5>;		/* No Pull */
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-mtp.dtsi b/arch/arm/boot/dts/qcom/msm8998-camera-sensor-mtp.dtsi
index 2be67ab52ba7..0bd9ab40e8f1 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-mtp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-camera-sensor-mtp.dtsi
@@ -15,18 +15,18 @@
 	led_flash0: qcom,camera-flash@0 {
 		cell-index = <0>;
 		compatible = "qcom,camera-flash";
-		qcom,flash-source = <&pmicobalt_flash0 &pmicobalt_flash1>;
-		qcom,torch-source = <&pmicobalt_torch0 &pmicobalt_torch1>;
-		qcom,switch-source = <&pmicobalt_switch0>;
+		qcom,flash-source = <&pmi8998_flash0 &pmi8998_flash1>;
+		qcom,torch-source = <&pmi8998_torch0 &pmi8998_torch1>;
+		qcom,switch-source = <&pmi8998_switch0>;
 		status = "ok";
 	};
 
 	led_flash1: qcom,camera-flash@1 {
 		cell-index = <1>;
 		compatible = "qcom,camera-flash";
-		qcom,flash-source = <&pmicobalt_flash2>;
-		qcom,torch-source = <&pmicobalt_torch2>;
-		qcom,switch-source = <&pmicobalt_switch1>;
+		qcom,flash-source = <&pmi8998_flash2>;
+		qcom,torch-source = <&pmi8998_torch2>;
+		qcom,switch-source = <&pmi8998_switch1>;
 		status = "ok";
 	};
 };
@@ -82,9 +82,9 @@
 		cell-index = <0>;
 		reg = <0>;
 		compatible = "qcom,eeprom";
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage = <0 3312000 1352000>;
 		qcom,cam-vreg-max-voltage = <0 3600000 1352000>;
@@ -99,7 +99,7 @@
 				&cam_actuator_vaf_suspend>;
 		gpios = <&tlmm 13 0>,
 			<&tlmm 30 0>,
-			<&pmcobalt_gpios 20 0>,
+			<&pm8998_gpios 20 0>,
 			<&tlmm 29 0>,
 			<&tlmm 27 0>;
 		qcom,gpio-reset = <1>;
@@ -127,9 +127,9 @@
 		cell-index = <1>;
 		reg = <0x1>;
 		compatible = "qcom,eeprom";
-		cam_vdig-supply = <&pmcobalt_lvs1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
+		cam_vdig-supply = <&pm8998_lvs1>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
 		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
 		qcom,cam-vreg-min-voltage = <0 0 3312000>;
 		qcom,cam-vreg-max-voltage = <0 0 3600000>;
@@ -164,9 +164,9 @@
 		cell-index = <2>;
 		reg = <0x2>;
 		compatible = "qcom,eeprom";
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmcobalt_l22>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pm8998_l22>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage =
 			<0 2864000 1352000>;
@@ -181,7 +181,7 @@
 				 &cam_sensor_front_suspend>;
 		gpios = <&tlmm 14 0>,
 			<&tlmm 28 0>,
-			<&pmcobalt_gpios 9 0>;
+			<&pm8998_gpios 9 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
 		qcom,gpio-req-tbl-num = <0 1 2>;
@@ -210,9 +210,9 @@
 		qcom,actuator-src = <&actuator0>;
 		qcom,ois-src = <&ois0>;
 		qcom,eeprom-src = <&eeprom0>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage = <0 3312000 1352000>;
 		qcom,cam-vreg-max-voltage = <0 3600000 1352000>;
@@ -225,7 +225,7 @@
 				 &cam_sensor_rear_suspend>;
 		gpios = <&tlmm 13 0>,
 			<&tlmm 30 0>,
-			<&pmcobalt_gpios 20 0>,
+			<&pm8998_gpios 20 0>,
 			<&tlmm 29 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
@@ -254,9 +254,9 @@
 		qcom,csid-sd-index = <1>;
 		qcom,mount-angle = <90>;
 		qcom,eeprom-src = <&eeprom1>;
-		cam_vdig-supply = <&pmcobalt_lvs1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
+		cam_vdig-supply = <&pm8998_lvs1>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
 		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
 		qcom,cam-vreg-min-voltage = <0 0 3312000>;
 		qcom,cam-vreg-max-voltage = <0 0 3600000>;
@@ -297,9 +297,9 @@
 		qcom,eeprom-src = <&eeprom2>;
 		qcom,led-flash-src = <&led_flash1>;
 		qcom,actuator-src = <&actuator1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmcobalt_l22>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pm8998_l22>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage =
 			<0 2864000 1352000>;
@@ -314,7 +314,7 @@
 				 &cam_sensor_front_suspend>;
 		gpios = <&tlmm 14 0>,
 			<&tlmm 28 0>,
-			<&pmcobalt_gpios 9 0>;
+			<&pm8998_gpios 9 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
 		qcom,gpio-req-tbl-num = <0 1 2>;
@@ -332,7 +332,7 @@
 		qcom,clock-rates = <24000000 0>;
 	};
 };
-&pmcobalt_gpios {
+&pm8998_gpios {
 	gpio@c800 { /* GPIO 9 - CAMERA SENSOR 2 VDIG */
 		qcom,mode = <1>;		/* Output */
 		qcom,pull = <5>;		/* No Pull */
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-qrd-vr1.dtsi b/arch/arm/boot/dts/qcom/msm8998-camera-sensor-qrd-vr1.dtsi
index 0fb1a0425dd5..a56e9836784c 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-qrd-vr1.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-camera-sensor-qrd-vr1.dtsi
@@ -15,16 +15,16 @@
 	led_flash0: qcom,camera-flash@0 {
 		cell-index = <0>;
 		compatible = "qcom,camera-flash";
-		qcom,flash-source = <&pmicobalt_flash0 &pmicobalt_flash1>;
-		qcom,switch-source = <&pmicobalt_switch0>;
+		qcom,flash-source = <&pmi8998_flash0 &pmi8998_flash1>;
+		qcom,switch-source = <&pmi8998_switch0>;
 		status = "ok";
 	};
 
 	led_flash1: qcom,camera-flash@1 {
 		cell-index = <1>;
 		compatible = "qcom,camera-flash";
-		qcom,flash-source = <&pmicobalt_flash2>;
-		qcom,switch-source = <&pmicobalt_switch1>;
+		qcom,flash-source = <&pmi8998_flash2>;
+		qcom,switch-source = <&pmi8998_switch1>;
 		status = "ok";
 	};
 };
@@ -106,9 +106,9 @@
 		cell-index = <0>;
 		reg = <0>;
 		compatible = "qcom,eeprom";
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage = <0 3312000 1352000>;
 		qcom,cam-vreg-max-voltage = <0 3600000 1352000>;
@@ -121,7 +121,7 @@
 						&cam_sensor_rear_suspend>;
 		gpios = <&tlmm 13 0>,
 				<&tlmm 30 0>,
-				<&pmcobalt_gpios 20 0>,
+				<&pm8998_gpios 20 0>,
 				<&tlmm 29 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
@@ -146,9 +146,9 @@
 		cell-index = <1>;
 		reg = <0x1>;
 		compatible = "qcom,eeprom";
-		cam_vdig-supply = <&pmcobalt_lvs1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
+		cam_vdig-supply = <&pm8998_lvs1>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
 		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
 		qcom,cam-vreg-min-voltage = <0 0 3312000>;
 		qcom,cam-vreg-max-voltage = <0 0 3600000>;
@@ -183,9 +183,9 @@
 		cell-index = <2>;
 		reg = <0x2>;
 		compatible = "qcom,eeprom";
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmcobalt_l22>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pm8998_l22>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage = <0 2864000 1352000>;
 		qcom,cam-vreg-max-voltage = <0 2864000 1352000>;
@@ -198,7 +198,7 @@
 						&cam_sensor_front_suspend>;
 		gpios = <&tlmm 15 0>,
 			<&tlmm 9 0>,
-			<&pmcobalt_gpios 9 0>;
+			<&pm8998_gpios 9 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
 		qcom,gpio-req-tbl-num = <0 1 2>;
@@ -226,9 +226,9 @@
 		qcom,led-flash-src = <&led_flash0>;
 		qcom,actuator-src = <&actuator0>;
 		qcom,eeprom-src = <&eeprom0>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage = <0 3312000 1352000>;
 		qcom,cam-vreg-max-voltage = <0 3600000 1352000>;
@@ -241,7 +241,7 @@
 						&cam_sensor_rear_suspend>;
 		gpios = <&tlmm 13 0>,
 			<&tlmm 30 0>,
-			<&pmcobalt_gpios 20 0>,
+			<&pm8998_gpios 20 0>,
 			<&tlmm 29 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
@@ -270,8 +270,8 @@
 		qcom,csid-sd-index = <1>;
 		qcom,mount-angle = <90>;
 		qcom,eeprom-src = <&eeprom1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana";
 		qcom,cam-vreg-min-voltage = <0 3312000>;
 		qcom,cam-vreg-max-voltage = <0 3600000>;
@@ -312,9 +312,9 @@
 		qcom,eeprom-src = <&eeprom2>;
 		qcom,led-flash-src = <&led_flash1>;
 		qcom,actuator-src = <&actuator1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmcobalt_l22>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pm8998_l22>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage = <0 2864000 1352000>;
 		qcom,cam-vreg-max-voltage = <0 2864000 1352000>;
@@ -327,7 +327,7 @@
 						&cam_sensor_front_suspend>;
 		gpios = <&tlmm 15 0>,
 				<&tlmm 9 0>,
-				<&pmcobalt_gpios 9 0>;
+				<&pm8998_gpios 9 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
 		qcom,gpio-req-tbl-num = <0 1 2>;
@@ -346,7 +346,7 @@
 	};
 };
 
-&pmcobalt_gpios {
+&pm8998_gpios {
 	gpio@c800 { /* GPIO 9 - CAMERA SENSOR 2 VDIG */
 		qcom,mode = <1>;		/* Output */
 		qcom,pull = <5>;		/* No Pull */
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-qrd.dtsi b/arch/arm/boot/dts/qcom/msm8998-camera-sensor-qrd.dtsi
index 4b435aee73b0..03abb5d69b52 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-qrd.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-camera-sensor-qrd.dtsi
@@ -16,18 +16,18 @@
 	led_flash0: qcom,camera-flash@0 {
 		cell-index = <0>;
 		compatible = "qcom,camera-flash";
-		qcom,flash-source = <&pmicobalt_flash0 &pmicobalt_flash1>;
-		qcom,torch-source = <&pmicobalt_torch0 &pmicobalt_torch1>;
-		qcom,switch-source = <&pmicobalt_switch0>;
+		qcom,flash-source = <&pmi8998_flash0 &pmi8998_flash1>;
+		qcom,torch-source = <&pmi8998_torch0 &pmi8998_torch1>;
+		qcom,switch-source = <&pmi8998_switch0>;
 		status = "ok";
 	};
 
 	led_flash1: qcom,camera-flash@1 {
 		cell-index = <1>;
 		compatible = "qcom,camera-flash";
-		qcom,flash-source = <&pmicobalt_flash2>;
-		qcom,torch-source = <&pmicobalt_torch2>;
-		qcom,switch-source = <&pmicobalt_switch1>;
+		qcom,flash-source = <&pmi8998_flash2>;
+		qcom,torch-source = <&pmi8998_torch2>;
+		qcom,switch-source = <&pmi8998_switch1>;
 		status = "ok";
 	};
 };
@@ -83,9 +83,9 @@
 		cell-index = <0>;
 		reg = <0>;
 		compatible = "qcom,eeprom";
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage = <0 3312000 1352000>;
 		qcom,cam-vreg-max-voltage = <0 3312000 1352000>;
@@ -100,7 +100,7 @@
 				&cam_actuator_vaf_suspend>;
 		gpios = <&tlmm 13 0>,
 			<&tlmm 30 0>,
-			<&pmcobalt_gpios 20 0>,
+			<&pm8998_gpios 20 0>,
 			<&tlmm 29 0>,
 			<&tlmm 27 0>;
 		qcom,gpio-reset = <1>;
@@ -128,9 +128,9 @@
 		cell-index = <1>;
 		reg = <0x1>;
 		compatible = "qcom,eeprom";
-		cam_vdig-supply = <&pmcobalt_lvs1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
+		cam_vdig-supply = <&pm8998_lvs1>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
 		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
 		qcom,cam-vreg-min-voltage = <0 0 3312000>;
 		qcom,cam-vreg-max-voltage = <0 0 3312000>;
@@ -165,9 +165,9 @@
 		cell-index = <2>;
 		reg = <0x2>;
 		compatible = "qcom,eeprom";
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmcobalt_l22>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pm8998_l22>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage =
 			<0 2864000 1352000>;
@@ -182,7 +182,7 @@
 				 &cam_sensor_front_suspend>;
 		gpios = <&tlmm 14 0>,
 			<&tlmm 28 0>,
-			<&pmcobalt_gpios 9 0>;
+			<&pm8998_gpios 9 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
 		qcom,gpio-req-tbl-num = <0 1 2>;
@@ -211,9 +211,9 @@
 		qcom,actuator-src = <&actuator0>;
 		qcom,ois-src = <&ois0>;
 		qcom,eeprom-src = <&eeprom0>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage = <0 3312000 1352000>;
 		qcom,cam-vreg-max-voltage = <0 3312000 1352000>;
@@ -226,7 +226,7 @@
 				 &cam_sensor_rear_suspend>;
 		gpios = <&tlmm 13 0>,
 			<&tlmm 30 0>,
-			<&pmcobalt_gpios 20 0>,
+			<&pm8998_gpios 20 0>,
 			<&tlmm 29 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
@@ -255,9 +255,9 @@
 		qcom,csid-sd-index = <1>;
 		qcom,mount-angle = <90>;
 		qcom,eeprom-src = <&eeprom1>;
-		cam_vdig-supply = <&pmcobalt_lvs1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
+		cam_vdig-supply = <&pm8998_lvs1>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
 		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
 		qcom,cam-vreg-min-voltage = <0 0 3312000>;
 		qcom,cam-vreg-max-voltage = <0 0 3312000>;
@@ -298,9 +298,9 @@
 		qcom,eeprom-src = <&eeprom2>;
 		qcom,led-flash-src = <&led_flash1>;
 		qcom,actuator-src = <&actuator1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmcobalt_l22>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pm8998_l22>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage =
 			<0 2864000 1352000>;
@@ -315,7 +315,7 @@
 				 &cam_sensor_front_suspend>;
 		gpios = <&tlmm 14 0>,
 			<&tlmm 28 0>,
-			<&pmcobalt_gpios 9 0>;
+			<&pm8998_gpios 9 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
 		qcom,gpio-req-tbl-num = <0 1 2>;
@@ -333,7 +333,7 @@
 		qcom,clock-rates = <24000000 0>;
 	};
 };
-&pmcobalt_gpios {
+&pm8998_gpios {
 	gpio@c800 { /* GPIO 9 - CAMERA SENSOR 2 VDIG */
 		qcom,mode = <1>;		/* Output */
 		qcom,pull = <5>;		/* No Pull */
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-skuk.dtsi b/arch/arm/boot/dts/qcom/msm8998-camera-sensor-skuk.dtsi
index a432f0710fe2..da568fd8979c 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-camera-sensor-skuk.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-camera-sensor-skuk.dtsi
@@ -15,16 +15,16 @@
 	led_flash0: qcom,camera-flash@0 {
 		cell-index = <0>;
 		compatible = "qcom,camera-flash";
-		qcom,flash-source = <&pmicobalt_flash0 &pmicobalt_flash1>;
-		qcom,switch-source = <&pmicobalt_switch0>;
+		qcom,flash-source = <&pmi8998_flash0 &pmi8998_flash1>;
+		qcom,switch-source = <&pmi8998_switch0>;
 		status = "ok";
 	};
 
 	led_flash1: qcom,camera-flash@1 {
 		cell-index = <1>;
 		compatible = "qcom,camera-flash";
-		qcom,flash-source = <&pmicobalt_flash2>;
-		qcom,switch-source = <&pmicobalt_switch1>;
+		qcom,flash-source = <&pmi8998_flash2>;
+		qcom,switch-source = <&pmi8998_switch1>;
 		status = "ok";
 	};
 };
@@ -64,9 +64,9 @@
 		cell-index = <0>;
 		reg = <0>;
 		compatible = "qcom,eeprom";
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage = <0 3312000 1352000>;
 		qcom,cam-vreg-max-voltage = <0 3600000 1352000>;
@@ -79,7 +79,7 @@
 				 &cam_sensor_rear_suspend>;
 		gpios = <&tlmm 13 0>,
 			<&tlmm 30 0>,
-			<&pmcobalt_gpios 20 0>,
+			<&pm8998_gpios 20 0>,
 			<&tlmm 29 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
@@ -104,9 +104,9 @@
 		cell-index = <1>;
 		reg = <0x1>;
 		compatible = "qcom,eeprom";
-		cam_vdig-supply = <&pmcobalt_lvs1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
+		cam_vdig-supply = <&pm8998_lvs1>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
 		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
 		qcom,cam-vreg-min-voltage = <0 0 3312000>;
 		qcom,cam-vreg-max-voltage = <0 0 3600000>;
@@ -141,9 +141,9 @@
 		cell-index = <2>;
 		reg = <0x2>;
 		compatible = "qcom,eeprom";
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmcobalt_l22>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pm8998_l22>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage =
 			<0 2864000 1352000>;
@@ -158,7 +158,7 @@
 				 &cam_sensor_front_suspend>;
 		gpios = <&tlmm 14 0>,
 			<&tlmm 28 0>,
-			<&pmcobalt_gpios 9 0>;
+			<&pm8998_gpios 9 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
 		qcom,gpio-req-tbl-num = <0 1 2>;
@@ -185,9 +185,9 @@
 		qcom,csid-sd-index = <0>;
 		qcom,mount-angle = <270>;
 		qcom,eeprom-src = <&eeprom0>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage = <0 3312000 1352000>;
 		qcom,cam-vreg-max-voltage = <0 3600000 1352000>;
@@ -200,7 +200,7 @@
 				 &cam_sensor_rear_suspend>;
 		gpios = <&tlmm 13 0>,
 			<&tlmm 30 0>,
-			<&pmcobalt_gpios 20 0>,
+			<&pm8998_gpios 20 0>,
 			<&tlmm 29 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
@@ -229,9 +229,9 @@
 		qcom,csid-sd-index = <1>;
 		qcom,mount-angle = <90>;
 		qcom,eeprom-src = <&eeprom1>;
-		cam_vdig-supply = <&pmcobalt_lvs1>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmicobalt_bob>;
+		cam_vdig-supply = <&pm8998_lvs1>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pmi8998_bob>;
 		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
 		qcom,cam-vreg-min-voltage = <0 0 3312000>;
 		qcom,cam-vreg-max-voltage = <0 0 3600000>;
@@ -269,9 +269,9 @@
 		qcom,csiphy-sd-index = <2>;
 		qcom,csid-sd-index = <2>;
 		qcom,mount-angle = <90>;
-		cam_vio-supply = <&pmcobalt_lvs1>;
-		cam_vana-supply = <&pmcobalt_l22>;
-		cam_vdig-supply = <&pmcobalt_s3>;
+		cam_vio-supply = <&pm8998_lvs1>;
+		cam_vana-supply = <&pm8998_l22>;
+		cam_vdig-supply = <&pm8998_s3>;
 		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
 		qcom,cam-vreg-min-voltage =
 			<0 2864000 1352000>;
@@ -286,7 +286,7 @@
 				 &cam_sensor_rear2_suspend>;
 		gpios = <&tlmm 15 0>,
 			<&tlmm 9 0>,
-			<&pmcobalt_gpios 9 0>;
+			<&pm8998_gpios 9 0>;
 		qcom,gpio-reset = <1>;
 		qcom,gpio-vdig = <2>;
 		qcom,gpio-req-tbl-num = <0 1 2>;
@@ -304,7 +304,7 @@
 		qcom,clock-rates = <24000000 0>;
 	};
 };
-&pmcobalt_gpios {
+&pm8998_gpios {
 	gpio@c800 { /* GPIO 9 - CAMERA SENSOR 2 VDIG */
 		qcom,mode = <1>;		/* Output */
 		qcom,pull = <5>;		/* No Pull */
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-camera.dtsi b/arch/arm/boot/dts/qcom/msm8998-camera.dtsi
index 6a0061e206ca..d0fa9921da3f 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-camera.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-camera.dtsi
@@ -134,9 +134,9 @@
 		interrupts = <0 296 0>;
 		interrupt-names = "csid";
 		qcom,csi-vdd-voltage = <1200000>;
-		qcom,mipi-csi-vdd-supply = <&pmcobalt_l2>;
+		qcom,mipi-csi-vdd-supply = <&pm8998_l2>;
 		gdscr-supply = <&gdsc_camss_top>;
-		vdd_sec-supply = <&pmcobalt_l1>;
+		vdd_sec-supply = <&pm8998_l1>;
 		bimc_smmu-supply = <&gdsc_bimc_smmu>;
 		qcom,cam-vreg-name = "vdd_sec", "gdscr", "bimc_smmu";
 		clocks = <&clock_gcc clk_mmssnoc_axi_clk>,
@@ -172,9 +172,9 @@
 		interrupts = <0 297 0>;
 		interrupt-names = "csid";
 		qcom,csi-vdd-voltage = <1200000>;
-		qcom,mipi-csi-vdd-supply = <&pmcobalt_l2>;
+		qcom,mipi-csi-vdd-supply = <&pm8998_l2>;
 		gdscr-supply = <&gdsc_camss_top>;
-		vdd_sec-supply = <&pmcobalt_l1>;
+		vdd_sec-supply = <&pm8998_l1>;
 		bimc_smmu-supply = <&gdsc_bimc_smmu>;
 		qcom,cam-vreg-name = "vdd_sec", "gdscr", "bimc_smmu";
 		clocks = <&clock_gcc clk_mmssnoc_axi_clk>,
@@ -210,9 +210,9 @@
 		interrupts = <0 298 0>;
 		interrupt-names = "csid";
 		qcom,csi-vdd-voltage = <1200000>;
-		qcom,mipi-csi-vdd-supply = <&pmcobalt_l2>;
+		qcom,mipi-csi-vdd-supply = <&pm8998_l2>;
 		gdscr-supply = <&gdsc_camss_top>;
-		vdd_sec-supply = <&pmcobalt_l1>;
+		vdd_sec-supply = <&pm8998_l1>;
 		bimc_smmu-supply = <&gdsc_bimc_smmu>;
 		qcom,cam-vreg-name = "vdd_sec", "gdscr", "bimc_smmu";
 		clocks = <&clock_gcc clk_mmssnoc_axi_clk>,
@@ -248,9 +248,9 @@
 		interrupts = <0 299 0>;
 		interrupt-names = "csid";
 		qcom,csi-vdd-voltage = <1200000>;
-		qcom,mipi-csi-vdd-supply = <&pmcobalt_l2>;
+		qcom,mipi-csi-vdd-supply = <&pm8998_l2>;
 		gdscr-supply = <&gdsc_camss_top>;
-		vdd_sec-supply = <&pmcobalt_l1>;
+		vdd_sec-supply = <&pm8998_l1>;
 		bimc_smmu-supply = <&gdsc_bimc_smmu>;
 		qcom,cam-vreg-name = "vdd_sec", "gdscr", "bimc_smmu";
 		clocks = <&clock_gcc clk_mmssnoc_axi_clk>,
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-cdp.dts b/arch/arm/boot/dts/qcom/msm8998-cdp.dts
index 10edf71da2f3..487d71d4b6a8 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-cdp.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-cdp.dts
@@ -13,12 +13,12 @@
 
 /dts-v1/;
 
-#include "msmcobalt.dtsi"
-#include "msmcobalt-cdp.dtsi"
+#include "msm8998.dtsi"
+#include "msm8998-cdp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT v1 CDP";
-	compatible = "qcom,msmcobalt-cdp", "qcom,msmcobalt", "qcom,cdp";
+	model = "Qualcomm Technologies, Inc. MSM 8998 v1 CDP";
+	compatible = "qcom,msm8998-cdp", "qcom,msm8998", "qcom,cdp";
 	qcom,board-id = <1 0>;
 };
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8998-cdp.dtsi
index ca504a798659..ec57ab601d46 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-cdp.dtsi
@@ -10,17 +10,17 @@
  * GNU General Public License for more details.
  */
 
-#include "msmcobalt-pinctrl.dtsi"
-#include "msmcobalt-camera-sensor-cdp.dtsi"
+#include "msm8998-pinctrl.dtsi"
+#include "msm8998-camera-sensor-cdp.dtsi"
 / {
 	bluetooth: bt_wcn3990 {
 		compatible = "qca,wcn3990";
-		qca,bt-vdd-io-supply = <&pmcobalt_s3>;
-		qca,bt-vdd-xtal-supply = <&pmcobalt_s5>;
-		qca,bt-vdd-core-supply = <&pmcobalt_l7>;
-		qca,bt-vdd-pa-supply = <&pmcobalt_l17>;
-		qca,bt-vdd-ldo-supply = <&pmcobalt_l25>;
-		qca,bt-chip-pwd-supply = <&pmicobalt_bob_pin1>;
+		qca,bt-vdd-io-supply = <&pm8998_s3>;
+		qca,bt-vdd-xtal-supply = <&pm8998_s5>;
+		qca,bt-vdd-core-supply = <&pm8998_l7>;
+		qca,bt-vdd-pa-supply = <&pm8998_l17>;
+		qca,bt-vdd-ldo-supply = <&pm8998_l25>;
+		qca,bt-chip-pwd-supply = <&pmi8998_bob_pin1>;
 		clocks = <&clock_gcc clk_rf_clk2_pin>;
 		clock-names = "rf_clk2";
 
@@ -44,9 +44,9 @@
 };
 
 &ufsphy1 {
-	vdda-phy-supply = <&pmcobalt_l1>;
-	vdda-pll-supply = <&pmcobalt_l2>;
-	vddp-ref-clk-supply = <&pmcobalt_l26>;
+	vdda-phy-supply = <&pm8998_l1>;
+	vdda-pll-supply = <&pm8998_l2>;
+	vddp-ref-clk-supply = <&pm8998_l26>;
 	vdda-phy-max-microamp = <51400>;
 	vdda-pll-max-microamp = <14600>;
 	vddp-ref-clk-max-microamp = <100>;
@@ -57,9 +57,9 @@
 &ufs1 {
 	vdd-hba-supply = <&gdsc_ufs>;
 	vdd-hba-fixed-regulator;
-	vcc-supply = <&pmcobalt_l20>;
-	vccq-supply = <&pmcobalt_l26>;
-	vccq2-supply = <&pmcobalt_s4>;
+	vcc-supply = <&pm8998_l20>;
+	vccq-supply = <&pm8998_l26>;
+	vccq2-supply = <&pm8998_s4>;
 	vcc-max-microamp = <750000>;
 	vccq-max-microamp = <560000>;
 	vccq2-max-microamp = <750000>;
@@ -71,11 +71,11 @@
 };
 
 &sdhc_2 {
-	vdd-supply = <&pmcobalt_l21>;
+	vdd-supply = <&pm8998_l21>;
 	qcom,vdd-voltage-level = <2950000 2960000>;
 	qcom,vdd-current-level = <200 800000>;
 
-	vdd-io-supply = <&pmcobalt_l13>;
+	vdd-io-supply = <&pm8998_l13>;
 	qcom,vdd-io-voltage-level = <1808000 2960000>;
 	qcom,vdd-io-current-level = <200 22000>;
 
@@ -98,7 +98,7 @@
 	pinctrl-0 = <&uart_console_active>;
 };
 
-&pmcobalt_gpios {
+&pm8998_gpios {
 	/* GPIO 5 for Home Key */
 	gpio@c400 {
 		status = "okay";
@@ -167,8 +167,8 @@
 		reg = <0x20>;
 		interrupt-parent = <&tlmm>;
 		interrupts = <125 0x2008>;
-		vdd-supply = <&pmcobalt_l6>;
-		avdd-supply = <&pmcobalt_l28>;
+		vdd-supply = <&pm8998_l6>;
+		avdd-supply = <&pm8998_l28>;
 		synaptics,vdd-voltage = <1808000 1808000>;
 		synaptics,avdd-voltage = <3008000 3008000>;
 		synaptics,vdd-current = <40000>;
@@ -193,7 +193,7 @@
 		qcom,nq-irq = <&tlmm 92 0x00>;
 		qcom,nq-ven = <&tlmm 12 0x00>;
 		qcom,nq-firm = <&tlmm 93 0x00>;
-		qcom,nq-clkreq = <&pmcobalt_gpios 21 0x00>;
+		qcom,nq-clkreq = <&pm8998_gpios 21 0x00>;
 		qcom,nq-esepwr = <&tlmm 116 0x00>;
 		interrupt-parent = <&tlmm>;
 		qcom,clk-src = "BBCLK3";
@@ -302,7 +302,7 @@
 	qcom,qpnp-labibb-mode = "lcd";
 };
 
-&pmicobalt_wled {
+&pmi8998_wled {
 	qcom,led-strings-list = [00 01];
 };
 
@@ -432,15 +432,15 @@
 	qcom,usbplug-cc-gpio = <&tlmm 38 0>;
 };
 
-&pmicobalt_charger {
+&pmi8998_charger {
 	qcom,batteryless-platform;
 };
 
-&pmicobalt_haptics {
+&pmi8998_haptics {
 	status = "okay";
 };
 
-&pmcobalt_vadc {
+&pm8998_vadc {
 	chan@83 {
 		label = "vph_pwr";
 		reg = <0x83>;
@@ -497,7 +497,7 @@
 	};
 };
 
-&pmcobalt_adc_tm {
+&pm8998_adc_tm {
 	chan@83 {
 		label = "vph_pwr";
 		reg = <0x83>;
@@ -554,7 +554,7 @@
 
 		home {
 			label = "home";
-			gpios = <&pmcobalt_gpios 5 0x1>;
+			gpios = <&pm8998_gpios 5 0x1>;
 			linux,input-type = <1>;
 			linux,code = <102>;
 			gpio-key,wakeup;
@@ -564,7 +564,7 @@
 
 		vol_up {
 			label = "volume_up";
-			gpios = <&pmcobalt_gpios 6 0x1>;
+			gpios = <&pm8998_gpios 6 0x1>;
 			linux,input-type = <1>;
 			linux,code = <115>;
 			gpio-key,wakeup;
@@ -573,7 +573,7 @@
 
 		cam_snapshot {
 			label = "cam_snapshot";
-			gpios = <&pmcobalt_gpios 7 0x1>;
+			gpios = <&pm8998_gpios 7 0x1>;
 			linux,input-type = <1>;
 			linux,code = <766>;
 			gpio-key,wakeup;
@@ -582,7 +582,7 @@
 
 		cam_focus {
 			label = "cam_focus";
-			gpios = <&pmcobalt_gpios 8 0x1>;
+			gpios = <&pm8998_gpios 8 0x1>;
 			linux,input-type = <1>;
 			linux,code = <528>;
 			gpio-key,wakeup;
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-coresight.dtsi b/arch/arm/boot/dts/qcom/msm8998-coresight.dtsi
index aeb6bf6141d8..aeb6bf6141d8 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-coresight.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-coresight.dtsi
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-gpu.dtsi b/arch/arm/boot/dts/qcom/msm8998-gpu.dtsi
index 8739e8f22549..8739e8f22549 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-gpu.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-gpu.dtsi
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-interposer-msmfalcon-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-cdp.dtsi
index 9663ef5a383f..32f9dcdecb0c 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-interposer-msmfalcon-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-cdp.dtsi
@@ -10,17 +10,17 @@
  * GNU General Public License for more details.
  */
 
-#include "msmcobalt-pinctrl.dtsi"
-#include "msmcobalt-camera-sensor-cdp.dtsi"
+#include "msm8998-pinctrl.dtsi"
+#include "msm8998-camera-sensor-cdp.dtsi"
 / {
 	bluetooth: bt_wcn3990 {
 		compatible = "qca,wcn3990";
-		qca,bt-vdd-io-supply = <&pmcobalt_s3>;
-		qca,bt-vdd-xtal-supply = <&pmcobalt_s5>;
-		qca,bt-vdd-core-supply = <&pmcobalt_l7_pin_ctrl>;
-		qca,bt-vdd-pa-supply = <&pmcobalt_l17_pin_ctrl>;
-		qca,bt-vdd-ldo-supply = <&pmcobalt_l25_pin_ctrl>;
-		qca,bt-chip-pwd-supply = <&pmicobalt_bob_pin1>;
+		qca,bt-vdd-io-supply = <&pm8998_s3>;
+		qca,bt-vdd-xtal-supply = <&pm8998_s5>;
+		qca,bt-vdd-core-supply = <&pm8998_l7_pin_ctrl>;
+		qca,bt-vdd-pa-supply = <&pm8998_l17_pin_ctrl>;
+		qca,bt-vdd-ldo-supply = <&pm8998_l25_pin_ctrl>;
+		qca,bt-chip-pwd-supply = <&pmi8998_bob_pin1>;
 		clocks = <&clock_gcc clk_rf_clk2>;
 		clock-names = "rf_clk2";
 
@@ -69,11 +69,11 @@
 };
 
 &sdhc_2 {
-	vdd-supply = <&pmcobalt_l21>;
+	vdd-supply = <&pm8998_l21>;
 	qcom,vdd-voltage-level = <2950000 2960000>;
 	qcom,vdd-current-level = <200 800000>;
 
-	vdd-io-supply = <&pmcobalt_l13>;
+	vdd-io-supply = <&pm8998_l13>;
 	qcom,vdd-io-voltage-level = <1808000 2960000>;
 	qcom,vdd-io-current-level = <200 22000>;
 
@@ -96,7 +96,7 @@
 	pinctrl-0 = <&uart_console_active>;
 };
 
-&pmcobalt_gpios {
+&pm8998_gpios {
 	/* GPIO 5 for Home Key */
 	gpio@c400 {
 		status = "okay";
@@ -165,8 +165,8 @@
 		reg = <0x20>;
 		interrupt-parent = <&tlmm>;
 		interrupts = <125 0x2008>;
-		vdd-supply = <&pmcobalt_l6>;
-		avdd-supply = <&pmcobalt_l28>;
+		vdd-supply = <&pm8998_l6>;
+		avdd-supply = <&pm8998_l28>;
 		synaptics,vdd-voltage = <1808000 1808000>;
 		synaptics,avdd-voltage = <3008000 3008000>;
 		synaptics,vdd-current = <40000>;
@@ -191,7 +191,7 @@
 		qcom,nq-irq = <&tlmm 92 0x00>;
 		qcom,nq-ven = <&tlmm 12 0x00>;
 		qcom,nq-firm = <&tlmm 93 0x00>;
-		qcom,nq-clkreq = <&pmcobalt_gpios 21 0x00>;
+		qcom,nq-clkreq = <&pm8998_gpios 21 0x00>;
 		qcom,nq-esepwr = <&tlmm 116 0x00>;
 		interrupt-parent = <&tlmm>;
 		qcom,clk-src = "BBCLK3";
@@ -308,7 +308,7 @@
 	qpnp,qpnp-labibb-mode = "lcd";
 };
 
-&pmicobalt_wled {
+&pmi8998_wled {
 	qcom,led-strings-list = [00 01];
 };
 
@@ -440,15 +440,15 @@
 	qcom,usbplug-cc-gpio = <&tlmm 38 0>;
 };
 
-&pmicobalt_charger {
+&pmi8998_charger {
 	qcom,batteryless-platform;
 };
 
-&pmicobalt_haptics {
+&pmi8998_haptics {
 	status = "okay";
 };
 
-&pmcobalt_vadc {
+&pm8998_vadc {
 	chan@83 {
 		label = "vph_pwr";
 		reg = <0x83>;
@@ -505,7 +505,7 @@
 	};
 };
 
-&pmcobalt_adc_tm {
+&pm8998_adc_tm {
 	chan@83 {
 		label = "vph_pwr";
 		reg = <0x83>;
@@ -562,7 +562,7 @@
 
 		home {
 			label = "home";
-			gpios = <&pmcobalt_gpios 5 0x1>;
+			gpios = <&pm8998_gpios 5 0x1>;
 			linux,input-type = <1>;
 			linux,code = <102>;
 			gpio-key,wakeup;
@@ -572,7 +572,7 @@
 
 		vol_up {
 			label = "volume_up";
-			gpios = <&pmcobalt_gpios 6 0x1>;
+			gpios = <&pm8998_gpios 6 0x1>;
 			linux,input-type = <1>;
 			linux,code = <115>;
 			gpio-key,wakeup;
@@ -581,7 +581,7 @@
 
 		cam_snapshot {
 			label = "cam_snapshot";
-			gpios = <&pmcobalt_gpios 7 0x1>;
+			gpios = <&pm8998_gpios 7 0x1>;
 			linux,input-type = <1>;
 			linux,code = <766>;
 			gpio-key,wakeup;
@@ -590,7 +590,7 @@
 
 		cam_focus {
 			label = "cam_focus";
-			gpios = <&pmcobalt_gpios 8 0x1>;
+			gpios = <&pm8998_gpios 8 0x1>;
 			linux,input-type = <1>;
 			linux,code = <528>;
 			gpio-key,wakeup;
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-interposer-msmfalcon-mtp.dtsi b/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-mtp.dtsi
index 0c8b6ff56124..e73ffc884210 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-interposer-msmfalcon-mtp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-mtp.dtsi
@@ -11,17 +11,17 @@
  */
 
 #include <dt-bindings/interrupt-controller/irq.h>
-#include "msmcobalt-pinctrl.dtsi"
-#include "msmcobalt-camera-sensor-mtp.dtsi"
+#include "msm8998-pinctrl.dtsi"
+#include "msm8998-camera-sensor-mtp.dtsi"
 / {
 	bluetooth: bt_wcn3990 {
 		compatible = "qca,wcn3990";
-		qca,bt-vdd-io-supply = <&pmcobalt_s3>;
-		qca,bt-vdd-xtal-supply = <&pmcobalt_s5>;
-		qca,bt-vdd-core-supply = <&pmcobalt_l7_pin_ctrl>;
-		qca,bt-vdd-pa-supply = <&pmcobalt_l17_pin_ctrl>;
-		qca,bt-vdd-ldo-supply = <&pmcobalt_l25_pin_ctrl>;
-		qca,bt-chip-pwd-supply = <&pmicobalt_bob_pin1>;
+		qca,bt-vdd-io-supply = <&pm8998_s3>;
+		qca,bt-vdd-xtal-supply = <&pm8998_s5>;
+		qca,bt-vdd-core-supply = <&pm8998_l7_pin_ctrl>;
+		qca,bt-vdd-pa-supply = <&pm8998_l17_pin_ctrl>;
+		qca,bt-vdd-ldo-supply = <&pm8998_l25_pin_ctrl>;
+		qca,bt-chip-pwd-supply = <&pmi8998_bob_pin1>;
 		clocks = <&clock_gcc clk_rf_clk2>;
 		clock-names = "rf_clk2";
 
@@ -70,11 +70,11 @@
 };
 
 &sdhc_2 {
-	vdd-supply = <&pmcobalt_l21>;
+	vdd-supply = <&pm8998_l21>;
 	qcom,vdd-voltage-level = <2950000 2960000>;
 	qcom,vdd-current-level = <200 800000>;
 
-	vdd-io-supply = <&pmcobalt_l13>;
+	vdd-io-supply = <&pm8998_l13>;
 	qcom,vdd-io-voltage-level = <1808000 2960000>;
 	qcom,vdd-io-current-level = <200 22000>;
 
@@ -97,7 +97,7 @@
 	pinctrl-0 = <&uart_console_active>;
 };
 
-&pmcobalt_gpios {
+&pm8998_gpios {
 	/* GPIO 6 for Vol+ Key */
 	gpio@c500 {
 		status = "okay";
@@ -166,8 +166,8 @@
 		reg = <0x20>;
 		interrupt-parent = <&tlmm>;
 		interrupts = <125 0x2008>;
-		vdd-supply = <&pmcobalt_l6>;
-		avdd-supply = <&pmcobalt_l28>;
+		vdd-supply = <&pm8998_l6>;
+		avdd-supply = <&pm8998_l28>;
 		synaptics,vdd-voltage = <1808000 1808000>;
 		synaptics,avdd-voltage = <3008000 3008000>;
 		synaptics,vdd-current = <40000>;
@@ -192,7 +192,7 @@
 		qcom,nq-irq = <&tlmm 92 0x00>;
 		qcom,nq-ven = <&tlmm 12 0x00>;
 		qcom,nq-firm = <&tlmm 93 0x00>;
-		qcom,nq-clkreq = <&pmcobalt_gpios 21 0x00>;
+		qcom,nq-clkreq = <&pm8998_gpios 21 0x00>;
 		qcom,nq-esepwr = <&tlmm 116 0x00>;
 		interrupt-parent = <&tlmm>;
 		qcom,clk-src = "BBCLK3";
@@ -363,7 +363,7 @@
 	qpnp,qpnp-labibb-mode = "lcd";
 };
 
-&pmicobalt_wled {
+&pmi8998_wled {
 	qcom,led-strings-list = [00 01];
 };
 
@@ -467,11 +467,11 @@
 	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
 };
 
-&pmicobalt_haptics {
+&pmi8998_haptics {
 	status = "okay";
 };
 
-&pmcobalt_vadc {
+&pm8998_vadc {
 	chan@83 {
 		label = "vph_pwr";
 		reg = <0x83>;
@@ -528,7 +528,7 @@
 	};
 };
 
-&pmcobalt_adc_tm {
+&pm8998_adc_tm {
 	chan@83 {
 		label = "vph_pwr";
 		reg = <0x83>;
@@ -585,7 +585,7 @@
 
 		vol_up {
 			label = "volume_up";
-			gpios = <&pmcobalt_gpios 6 0x1>;
+			gpios = <&pm8998_gpios 6 0x1>;
 			linux,input-type = <1>;
 			linux,code = <115>;
 			gpio-key,wakeup;
@@ -594,7 +594,7 @@
 
 		cam_snapshot {
 			label = "cam_snapshot";
-			gpios = <&pmcobalt_gpios 7 0x1>;
+			gpios = <&pm8998_gpios 7 0x1>;
 			linux,input-type = <1>;
 			linux,code = <766>;
 			gpio-key,wakeup;
@@ -603,7 +603,7 @@
 
 		cam_focus {
 			label = "cam_focus";
-			gpios = <&pmcobalt_gpios 8 0x1>;
+			gpios = <&pm8998_gpios 8 0x1>;
 			linux,input-type = <1>;
 			linux,code = <528>;
 			gpio-key,wakeup;
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-interposer-msmfalcon.dtsi b/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon.dtsi
index ffb42576ffd3..861be92a7bc2 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-interposer-msmfalcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon.dtsi
@@ -11,13 +11,13 @@
  */
 
 #include "skeleton64.dtsi"
-#include <dt-bindings/clock/msm-clocks-cobalt.h>
+#include <dt-bindings/clock/msm-clocks-8998.h>
 #include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT";
-	compatible = "qcom,msmcobalt";
+	model = "Qualcomm Technologies, Inc. MSM 8998";
+	compatible = "qcom,msm8998";
 	qcom,msm-id = <292 0x0>;
 	interrupt-parent = <&intc>;
 
@@ -342,8 +342,8 @@
 	};
 };
 
-#include "msmcobalt-smp2p.dtsi"
-#include "msm-gdsc-cobalt.dtsi"
+#include "msm8998-smp2p.dtsi"
+#include "msm-gdsc-8998.dtsi"
 
 &soc {
 	#address-cells = <1>;
@@ -732,21 +732,21 @@
 	};
 
 	clock_gcc: qcom,gcc@100000 {
-		compatible = "qcom,gcc-cobalt";
+		compatible = "qcom,gcc-8998";
 		reg = <0x100000 0xb0000>;
 		reg-names = "cc_base";
-		vdd_dig-supply = <&pmcobalt_s1_level>;
-		vdd_dig_ao-supply = <&pmcobalt_s1_level_ao>;
+		vdd_dig-supply = <&pm8998_s1_level>;
+		vdd_dig_ao-supply = <&pm8998_s1_level_ao>;
 		#clock-cells = <1>;
 		#reset-cells = <1>;
 	};
 
 	clock_mmss: qcom,mmsscc@c8c0000 {
-		compatible = "qcom,mmsscc-cobalt";
+		compatible = "qcom,mmsscc-8998";
 		reg = <0xc8c0000 0x40000>;
 		reg-names = "cc_base";
-		vdd_dig-supply = <&pmcobalt_s1_level>;
-		vdd_mmsscc_mx-supply = <&pmcobalt_s9_level>;
+		vdd_dig-supply = <&pm8998_s1_level>;
+		vdd_mmsscc_mx-supply = <&pm8998_s9_level>;
 		clock-names = "xo", "gpll0", "gpll0_div",
 				"pclk0_src", "pclk1_src",
 				"byte0_src", "byte1_src",
@@ -767,10 +767,10 @@
 	};
 
 	clock_gpu: qcom,gpucc@5065000 {
-		compatible = "qcom,gpucc-cobalt";
+		compatible = "qcom,gpucc-8998";
 		reg = <0x5065000 0x9000>;
 		reg-names = "cc_base";
-		vdd_dig-supply = <&pmcobalt_s1_level>;
+		vdd_dig-supply = <&pm8998_s1_level>;
 		clock-names = "xo_ao", "gpll0";
 		clocks = <&clock_gcc clk_cxo_clk_src_ao>,
 			<&clock_gcc clk_gcc_gpu_gpll0_clk>;
@@ -778,12 +778,12 @@
 	};
 
 	clock_gfx: qcom,gfxcc@5065000 {
-		compatible = "qcom,gfxcc-cobalt";
+		compatible = "qcom,gfxcc-8998";
 		reg = <0x5065000 0x9000>;
 		reg-names = "cc_base";
 		vdd_gpucc-supply = <&gfx_vreg>;
-		vdd_mx-supply = <&pmcobalt_s9_level>;
-		vdd_gpu_mx-supply = <&pmcobalt_s9_level>;
+		vdd_mx-supply = <&pm8998_s9_level>;
+		vdd_gpu_mx-supply = <&pm8998_s9_level>;
 		qcom,gfx3d_clk_src-opp-handle = <&msm_gpu>;
 		qcom,gfxfreq-speedbin0 =
 			<	  0 0				0 >,
@@ -804,8 +804,8 @@
 		#clock-cells = <1>;
 	};
 
-	clock_cpu: qcom,cpu-clock-cobalt@179c0000 {
-		compatible = "qcom,cpu-clock-osm-msmcobalt-v1";
+	clock_cpu: qcom,cpu-clock-8998@179c0000 {
+		compatible = "qcom,cpu-clock-osm-msm8998-v1";
 		reg = <0x179c0000 0x4000>,
 		      <0x17916000 0x1000>,
 		      <0x17816000 0x1000>,
@@ -942,7 +942,7 @@
 	};
 
 	clock_debug: qcom,debugcc@162000 {
-		compatible = "qcom,cc-debug-cobalt";
+		compatible = "qcom,cc-debug-8998";
 		reg = <0x162000 0x4>;
 		reg-names = "cc_base";
 		clock-names = "debug_gpu_clk", "debug_gfx_clk",
@@ -1560,9 +1560,9 @@
 		wake-gpio = <&tlmm 37 0>;
 
 		gdsc-vdd-supply = <&gdsc_pcie_0>;
-		vreg-1.8-supply = <&pmcobalt_l2>;
-		vreg-0.9-supply = <&pmcobalt_l1>;
-		vreg-cx-supply = <&pmcobalt_s1_level>;
+		vreg-1.8-supply = <&pm8998_l2>;
+		vreg-0.9-supply = <&pm8998_l1>;
+		vreg-cx-supply = <&pm8998_s1_level>;
 
 		qcom,vreg-1.8-voltage-level = <1200000 1200000 24000>;
 		qcom,vreg-0.9-voltage-level = <880000 880000 24000>;
@@ -1853,7 +1853,7 @@
 					<61 512 240000 800000>;
 
 		qcom,dwc-usb3-msm-tx-fifo-size = <21288>;
-		extcon = <&pmicobalt_pdphy>;
+		extcon = <&pmi8998_pdphy>;
 
 		clocks = <&clock_gcc clk_gcc_usb30_master_clk>,
 			<&clock_gcc clk_gcc_cfg_noc_usb3_axi_clk>,
@@ -1921,9 +1921,9 @@
 		      <0x01fcb24c 0x4>;
 		reg-names = "qusb_phy_base",
 				"tcsr_clamp_dig_n_1p8";
-		vdd-supply = <&pmcobalt_l1>;
-		vdda18-supply = <&pmcobalt_l12>;
-		vdda33-supply = <&pmcobalt_l24>;
+		vdd-supply = <&pm8998_l1>;
+		vdda18-supply = <&pm8998_l12>;
+		vdda33-supply = <&pm8998_l24>;
 		qcom,vdd-voltage-level = <0 880000 880000>;
 		qcom,qusb-phy-init-seq =
 				/* <value reg_offset> */
@@ -1951,8 +1951,8 @@
 		reg-names = "qmp_phy_base",
 			    "vls_clamp_reg",
 			    "tcsr_usb3_dp_phymode";
-		vdd-supply = <&pmcobalt_l1>;
-		core-supply = <&pmcobalt_l2>;
+		vdd-supply = <&pm8998_l1>;
+		core-supply = <&pm8998_l2>;
 		qcom,vdd-voltage-level = <0 880000 880000>;
 		qcom,vbus-valid-override;
 		qcom,qmp-phy-init-seq =
@@ -2121,7 +2121,7 @@
 		reg = <0x17300000 0x00100>;
 		interrupts = <0 162 1>;
 
-		vdd_cx-supply = <&pmcobalt_s1_level>;
+		vdd_cx-supply = <&pm8998_s1_level>;
 		qcom,proxy-reg-names = "vdd_cx";
 		qcom,vdd_cx-uV-uA = <RPM_SMD_REGULATOR_LEVEL_TURBO 100000>;
 
@@ -2176,9 +2176,9 @@
 					  "mnoc_axi_clk";
 
 		interrupts = <0 448 1>;
-		vdd_cx-supply = <&pmcobalt_s1_level>;
+		vdd_cx-supply = <&pm8998_s1_level>;
 		vdd_cx-voltage = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-		vdd_mx-supply = <&pmcobalt_s9_level>;
+		vdd_mx-supply = <&pm8998_s9_level>;
 		vdd_mx-uV = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 		qcom,firmware-name = "modem";
 		qcom,pil-self-auth;
@@ -2202,7 +2202,7 @@
 	};
 
 	tsens0: tsens@10aa000 {
-		compatible = "qcom,msmcobalt-tsens";
+		compatible = "qcom,msm8998-tsens";
 		reg = <0x10aa000 0x2000>;
 		reg-names = "tsens_physical";
 		interrupts = <0 458 0>, <0 445 0>;
@@ -2213,7 +2213,7 @@
 	};
 
 	tsens1: tsens@10ad000 {
-		compatible = "qcom,msmcobalt-tsens";
+		compatible = "qcom,msm8998-tsens";
 		reg = <0x10ad000 0x2000>;
 		reg-names = "tsens_physical";
 		interrupts = <0 184 0>, <0 430 0>;
@@ -2538,7 +2538,7 @@
 		qcom,vdd-restriction-temp = <5>;
 		qcom,vdd-restriction-temp-hysteresis = <10>;
 
-		vdd-dig-supply = <&pmcobalt_s1_floor_level>;
+		vdd-dig-supply = <&pm8998_s1_floor_level>;
 		vdd-gfx-supply = <&gfx_vreg>;
 
 		qcom,vdd-dig-rstr{
@@ -2587,8 +2587,8 @@
 		reg = <0x5c00000 0x4000>;
 		interrupts = <0 390 1>;
 
-		vdd_cx-supply = <&pmcobalt_l27_level>;
-		vdd_px-supply = <&pmcobalt_lvs2>;
+		vdd_cx-supply = <&pm8998_l27_level>;
+		vdd_px-supply = <&pm8998_lvs2>;
 		qcom,vdd_cx-uV-uA = <RPM_SMD_REGULATOR_LEVEL_TURBO 0>;
 		qcom,proxy-reg-names = "vdd_cx", "vdd_px";
 		qcom,keep-proxy-regs-on;
@@ -2671,7 +2671,7 @@
 			    "sp2soc_irq_mask", "rmb_err", "rmb_err_spare2";
 		interrupts = <0 352 1>;
 
-		vdd_cx-supply = <&pmcobalt_s1_level>;
+		vdd_cx-supply = <&pm8998_s1_level>;
 		qcom,proxy-reg-names = "vdd_cx";
 		qcom,vdd_cx-uV-uA = <RPM_SMD_REGULATOR_LEVEL_TURBO 100000>;
 
@@ -2953,8 +2953,8 @@
 			<45 512 0 0>,
 			<45 512 600000 800000>; /* ~4.6Gbps (MCS12) */
 		qcom,use-ext-supply;
-		vdd-supply= <&pmcobalt_s7>;
-		vddio-supply= <&pmcobalt_s5>;
+		vdd-supply= <&pm8998_s7>;
+		vddio-supply= <&pm8998_s5>;
 		qcom,use-ext-clocks;
 		clocks = <&clock_gcc clk_rf_clk3>,
 			 <&clock_gcc clk_rf_clk3_pin>;
@@ -3067,27 +3067,27 @@
 	status = "ok";
 };
 
-#include "msm-pmcobalt.dtsi"
-#include "msm-pmicobalt.dtsi"
+#include "msm-pm8998.dtsi"
+#include "msm-pmi8998.dtsi"
 #include "msm-pm8005.dtsi"
-#include "msm-pmcobalt-rpm-regulator.dtsi"
-#include "msmcobalt-regulator.dtsi"
-
-#include "msmcobalt-pm.dtsi"
-#include "msm-arm-smmu-cobalt.dtsi"
-#include "msm-arm-smmu-impl-defs-cobalt.dtsi"
-#include "msmcobalt-ion.dtsi"
-#include "msmcobalt-camera.dtsi"
-#include "msmcobalt-vidc.dtsi"
-#include "msmcobalt-coresight.dtsi"
-#include "msmcobalt-bus.dtsi"
-#include "msmcobalt-gpu.dtsi"
-#include "msmcobalt-pinctrl.dtsi"
+#include "msm-pm8998-rpm-regulator.dtsi"
+#include "msm8998-regulator.dtsi"
+
+#include "msm8998-pm.dtsi"
+#include "msm-arm-smmu-8998.dtsi"
+#include "msm-arm-smmu-impl-defs-8998.dtsi"
+#include "msm8998-ion.dtsi"
+#include "msm8998-camera.dtsi"
+#include "msm8998-vidc.dtsi"
+#include "msm8998-coresight.dtsi"
+#include "msm8998-bus.dtsi"
+#include "msm8998-gpu.dtsi"
+#include "msm8998-pinctrl.dtsi"
 #include "msm-audio-lpass.dtsi"
-#include "msmcobalt-mdss.dtsi"
-#include "msmcobalt-mdss-pll.dtsi"
-#include "msmcobalt-blsp.dtsi"
-#include "msmcobalt-audio.dtsi"
+#include "msm8998-mdss.dtsi"
+#include "msm8998-mdss-pll.dtsi"
+#include "msm8998-blsp.dtsi"
+#include "msm8998-audio.dtsi"
 
 
 /* GPU overrides */
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-interposer-pmfalcon.dtsi b/arch/arm/boot/dts/qcom/msm8998-interposer-pmfalcon.dtsi
index f5d5c7f400f9..f5d5c7f400f9 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-interposer-pmfalcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-interposer-pmfalcon.dtsi
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-ion.dtsi b/arch/arm/boot/dts/qcom/msm8998-ion.dtsi
index 7b15fd81c710..7b15fd81c710 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-ion.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-ion.dtsi
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-mdss-panels.dtsi b/arch/arm/boot/dts/qcom/msm8998-mdss-panels.dtsi
index 6afd593f9610..6afd593f9610 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-mdss-panels.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-mdss-panels.dtsi
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-mdss-pll.dtsi b/arch/arm/boot/dts/qcom/msm8998-mdss-pll.dtsi
index af0eb60818fb..d12b0ea1a9cc 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-mdss-pll.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-mdss-pll.dtsi
@@ -12,7 +12,7 @@
 
 &soc {
 	mdss_dsi0_pll: qcom,mdss_dsi_pll@c994400 {
-		compatible = "qcom,mdss_dsi_pll_cobalt";
+		compatible = "qcom,mdss_dsi_pll_8998";
 		status = "ok";
 		label = "MDSS DSI 0 PLL";
 		cell-index = <0>;
@@ -48,7 +48,7 @@
 	};
 
 	mdss_dsi1_pll: qcom,mdss_dsi_pll@c996400 {
-		compatible = "qcom,mdss_dsi_pll_cobalt";
+		compatible = "qcom,mdss_dsi_pll_8998";
 		status = "ok";
 		label = "MDSS DSI 1 PLL";
 		cell-index = <1>;
@@ -83,7 +83,7 @@
 	};
 
 	mdss_dp_pll: qcom,mdss_dp_pll@c011000 {
-		compatible = "qcom,mdss_dp_pll_cobalt";
+		compatible = "qcom,mdss_dp_pll_8998";
 		status = "ok";
 		label = "MDSS DP PLL";
 		cell-index = <0>;
@@ -119,7 +119,7 @@
 	};
 
 	mdss_hdmi_pll: qcom,mdss_hdmi_pll@0xc9a0600 {
-		compatible = "qcom,mdss_hdmi_pll_cobalt";
+		compatible = "qcom,mdss_hdmi_pll_8998";
 		label = "MDSS HDMI PLL";
 		cell-index = <2>;
 		#clock-cells = <1>;
@@ -130,8 +130,8 @@
 		reg-names = "pll_base", "phy_base", "gdsc_base";
 
 		gdsc-supply = <&gdsc_mdss>;
-		vdda-pll-supply = <&pmcobalt_l2>;
-		vdda-phy-supply = <&pmcobalt_l12>;
+		vdda-pll-supply = <&pm8998_l2>;
+		vdda-phy-supply = <&pm8998_l12>;
 
 		clocks = <&clock_mmss clk_mmss_mdss_ahb_clk>,
 			 <&clock_gcc clk_gcc_hdmi_clkref_clk>,
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi b/arch/arm/boot/dts/qcom/msm8998-mdss.dtsi
index 75c985189842..dd2efefe264f 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-mdss.dtsi
@@ -284,8 +284,8 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		gdsc-supply = <&gdsc_mdss>;
-		vdda-1p2-supply = <&pmcobalt_l2>;
-		vdda-0p9-supply = <&pmcobalt_l1>;
+		vdda-1p2-supply = <&pm8998_l2>;
+		vdda-0p9-supply = <&pm8998_l1>;
 		ranges = <0xc994000 0xc994000 0x400
 			0xc994400 0xc994400 0x7c0
 			0xc828000 0xc828000 0xac
@@ -373,7 +373,7 @@
 			reg-names = "dsi_ctrl", "dsi_phy", "mmss_misc_phys";
 
 			qcom,timing-db-mode;
-			wqhd-vddio-supply = <&pmcobalt_l14>;
+			wqhd-vddio-supply = <&pm8998_l14>;
 			lab-supply = <&lab_regulator>;
 			ibb-supply = <&ibb_regulator>;
 			qcom,mdss-mdp = <&mdss_mdp>;
@@ -411,7 +411,7 @@
 			reg-names = "dsi_ctrl", "dsi_phy", "mmss_misc_phys";
 
 			qcom,timing-db-mode;
-			wqhd-vddio-supply = <&pmcobalt_l14>;
+			wqhd-vddio-supply = <&pm8998_l14>;
 			lab-supply = <&lab_regulator>;
 			ibb-supply = <&ibb_regulator>;
 			qcom,mdss-mdp = <&mdss_mdp>;
@@ -462,8 +462,8 @@
 		qcom,mdss-fb-map = <&mdss_fb3>;
 
 		gdsc-supply = <&gdsc_mdss>;
-		vdda-1p2-supply = <&pmcobalt_l2>;
-		vdda-0p9-supply = <&pmcobalt_l1>;
+		vdda-1p2-supply = <&pm8998_l2>;
+		vdda-0p9-supply = <&pm8998_l1>;
 
 		reg =	<0xc990000 0xa84>,
 			<0xc011000 0x910>,
@@ -492,7 +492,7 @@
 			"ctrl_link_clk", "ctrl_link_iface_clk",
 			"ctrl_crypto_clk", "ctrl_pixel_clk";
 
-		qcom,dp-usbpd-detection = <&pmicobalt_pdphy>;
+		qcom,dp-usbpd-detection = <&pmi8998_pdphy>;
 
 		qcom,msm_ext_disp = <&msm_ext_disp>;
 
@@ -643,4 +643,4 @@
 	};
 };
 
-#include "msmcobalt-mdss-panels.dtsi"
+#include "msm8998-mdss-panels.dtsi"
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-mtp.dts b/arch/arm/boot/dts/qcom/msm8998-mtp.dts
index ea4047df25f6..f608f5f59a80 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-mtp.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-mtp.dts
@@ -13,12 +13,12 @@
 
 /dts-v1/;
 
-#include "msmcobalt.dtsi"
-#include "msmcobalt-mtp.dtsi"
+#include "msm8998.dtsi"
+#include "msm8998-mtp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT v1 MTP";
-	compatible = "qcom,msmcobalt-mtp", "qcom,msmcobalt", "qcom,mtp";
+	model = "Qualcomm Technologies, Inc. MSM 8998 v1 MTP";
+	compatible = "qcom,msm8998-mtp", "qcom,msm8998", "qcom,mtp";
 	qcom,board-id = <8 0>;
 };
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi b/arch/arm/boot/dts/qcom/msm8998-mtp.dtsi
index 0cd6d0ab1f1d..76124833dc36 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-mtp.dtsi
@@ -11,17 +11,17 @@
  */
 
 #include <dt-bindings/interrupt-controller/irq.h>
-#include "msmcobalt-pinctrl.dtsi"
-#include "msmcobalt-camera-sensor-mtp.dtsi"
+#include "msm8998-pinctrl.dtsi"
+#include "msm8998-camera-sensor-mtp.dtsi"
 / {
 	bluetooth: bt_wcn3990 {
 		compatible = "qca,wcn3990";
-		qca,bt-vdd-io-supply = <&pmcobalt_s3>;
-		qca,bt-vdd-xtal-supply = <&pmcobalt_s5>;
-		qca,bt-vdd-core-supply = <&pmcobalt_l7>;
-		qca,bt-vdd-pa-supply = <&pmcobalt_l17>;
-		qca,bt-vdd-ldo-supply = <&pmcobalt_l25>;
-		qca,bt-chip-pwd-supply = <&pmicobalt_bob_pin1>;
+		qca,bt-vdd-io-supply = <&pm8998_s3>;
+		qca,bt-vdd-xtal-supply = <&pm8998_s5>;
+		qca,bt-vdd-core-supply = <&pm8998_l7>;
+		qca,bt-vdd-pa-supply = <&pm8998_l17>;
+		qca,bt-vdd-ldo-supply = <&pm8998_l25>;
+		qca,bt-chip-pwd-supply = <&pmi8998_bob_pin1>;
 		clocks = <&clock_gcc clk_rf_clk2_pin>;
 		clock-names = "rf_clk2";
 
@@ -45,9 +45,9 @@
 };
 
 &ufsphy1 {
-	vdda-phy-supply = <&pmcobalt_l1>;
-	vdda-pll-supply = <&pmcobalt_l2>;
-	vddp-ref-clk-supply = <&pmcobalt_l26>;
+	vdda-phy-supply = <&pm8998_l1>;
+	vdda-pll-supply = <&pm8998_l2>;
+	vddp-ref-clk-supply = <&pm8998_l26>;
 	vdda-phy-max-microamp = <51400>;
 	vdda-pll-max-microamp = <14600>;
 	vddp-ref-clk-max-microamp = <100>;
@@ -58,9 +58,9 @@
 &ufs1 {
 	vdd-hba-supply = <&gdsc_ufs>;
 	vdd-hba-fixed-regulator;
-	vcc-supply = <&pmcobalt_l20>;
-	vccq-supply = <&pmcobalt_l26>;
-	vccq2-supply = <&pmcobalt_s4>;
+	vcc-supply = <&pm8998_l20>;
+	vccq-supply = <&pm8998_l26>;
+	vccq2-supply = <&pm8998_s4>;
 	vcc-max-microamp = <750000>;
 	vccq-max-microamp = <560000>;
 	vccq2-max-microamp = <750000>;
@@ -72,11 +72,11 @@
 };
 
 &sdhc_2 {
-	vdd-supply = <&pmcobalt_l21>;
+	vdd-supply = <&pm8998_l21>;
 	qcom,vdd-voltage-level = <2950000 2960000>;
 	qcom,vdd-current-level = <200 800000>;
 
-	vdd-io-supply = <&pmcobalt_l13>;
+	vdd-io-supply = <&pm8998_l13>;
 	qcom,vdd-io-voltage-level = <1808000 2960000>;
 	qcom,vdd-io-current-level = <200 22000>;
 
@@ -99,7 +99,7 @@
 	pinctrl-0 = <&uart_console_active>;
 };
 
-&pmcobalt_gpios {
+&pm8998_gpios {
 	/* GPIO 2 for Home Key */
 	gpio@c100 {
 		status = "okay";
@@ -178,8 +178,8 @@
 		reg = <0x20>;
 		interrupt-parent = <&tlmm>;
 		interrupts = <125 0x2008>;
-		vdd-supply = <&pmcobalt_l6>;
-		avdd-supply = <&pmcobalt_l28>;
+		vdd-supply = <&pm8998_l6>;
+		avdd-supply = <&pm8998_l28>;
 		synaptics,vdd-voltage = <1808000 1808000>;
 		synaptics,avdd-voltage = <3008000 3008000>;
 		synaptics,vdd-current = <40000>;
@@ -204,7 +204,7 @@
 		qcom,nq-irq = <&tlmm 92 0x00>;
 		qcom,nq-ven = <&tlmm 12 0x00>;
 		qcom,nq-firm = <&tlmm 93 0x00>;
-		qcom,nq-clkreq = <&pmcobalt_gpios 21 0x00>;
+		qcom,nq-clkreq = <&pm8998_gpios 21 0x00>;
 		qcom,nq-esepwr = <&tlmm 116 0x00>;
 		interrupt-parent = <&tlmm>;
 		qcom,clk-src = "BBCLK3";
@@ -365,7 +365,7 @@
 	qcom,qpnp-labibb-mode = "lcd";
 };
 
-&pmicobalt_wled {
+&pmi8998_wled {
 	qcom,led-strings-list = [00 01];
 };
 
@@ -473,11 +473,11 @@
 	qcom,peripheral-size = <0x500000>;
 };
 
-&pmicobalt_haptics {
+&pmi8998_haptics {
 	status = "okay";
 };
 
-&pmcobalt_vadc {
+&pm8998_vadc {
 	chan@83 {
 		label = "vph_pwr";
 		reg = <0x83>;
@@ -534,7 +534,7 @@
 	};
 };
 
-&pmcobalt_adc_tm {
+&pm8998_adc_tm {
 	chan@83 {
 		label = "vph_pwr";
 		reg = <0x83>;
@@ -591,7 +591,7 @@
 
 		vol_up {
 			label = "volume_up";
-			gpios = <&pmcobalt_gpios 6 0x1>;
+			gpios = <&pm8998_gpios 6 0x1>;
 			linux,input-type = <1>;
 			linux,code = <115>;
 			gpio-key,wakeup;
@@ -600,7 +600,7 @@
 
 		cam_snapshot {
 			label = "cam_snapshot";
-			gpios = <&pmcobalt_gpios 7 0x1>;
+			gpios = <&pm8998_gpios 7 0x1>;
 			linux,input-type = <1>;
 			linux,code = <766>;
 			gpio-key,wakeup;
@@ -609,7 +609,7 @@
 
 		cam_focus {
 			label = "cam_focus";
-			gpios = <&pmcobalt_gpios 8 0x1>;
+			gpios = <&pm8998_gpios 8 0x1>;
 			linux,input-type = <1>;
 			linux,code = <528>;
 			gpio-key,wakeup;
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-pinctrl.dtsi b/arch/arm/boot/dts/qcom/msm8998-pinctrl.dtsi
index e5fd988dccce..1f5facd5cde5 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-pinctrl.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-pinctrl.dtsi
@@ -12,7 +12,7 @@
 
 &soc {
 	tlmm: pinctrl@03400000 {
-		compatible = "qcom,msmcobalt-pinctrl";
+		compatible = "qcom,msm8998-pinctrl";
 		reg = <0x03400000 0xc00000>;
 		interrupts = <0 208 0>;
 		gpio-controller;
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-pm.dtsi b/arch/arm/boot/dts/qcom/msm8998-pm.dtsi
index c6d7defbf35c..c6d7defbf35c 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-pm.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-pm.dtsi
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-qrd-skuk.dts b/arch/arm/boot/dts/qcom/msm8998-qrd-skuk.dts
index 88a5e945436c..d9afddd0ab46 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-qrd-skuk.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-qrd-skuk.dts
@@ -13,11 +13,11 @@
 
 /dts-v1/;
 
-#include "msmcobalt.dtsi"
-#include "msmcobalt-qrd-skuk.dtsi"
+#include "msm8998.dtsi"
+#include "msm8998-qrd-skuk.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT SKUK";
-	compatible = "qcom,msmcobalt-qrd", "qcom,msmcobalt", "qcom,qrd";
+	model = "Qualcomm Technologies, Inc. MSM 8998 SKUK";
+	compatible = "qcom,msm8998-qrd", "qcom,msm8998", "qcom,qrd";
 	qcom,board-id = <0x01000b 0x80>;
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-qrd-skuk.dtsi b/arch/arm/boot/dts/qcom/msm8998-qrd-skuk.dtsi
index 15756d13d2e0..cead74b02528 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-qrd-skuk.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-qrd-skuk.dtsi
@@ -11,18 +11,18 @@
  */
 
 #include <dt-bindings/interrupt-controller/irq.h>
-#include "msmcobalt-pinctrl.dtsi"
-#include "msmcobalt-audio.dtsi"
-#include "msmcobalt-camera-sensor-skuk.dtsi"
+#include "msm8998-pinctrl.dtsi"
+#include "msm8998-audio.dtsi"
+#include "msm8998-camera-sensor-skuk.dtsi"
 
 &blsp1_uart3_hs {
 	status = "ok";
 };
 
 &ufsphy1 {
-	vdda-phy-supply = <&pmcobalt_l1>;
-	vdda-pll-supply = <&pmcobalt_l2>;
-	vddp-ref-clk-supply = <&pmcobalt_l26>;
+	vdda-phy-supply = <&pm8998_l1>;
+	vdda-pll-supply = <&pm8998_l2>;
+	vddp-ref-clk-supply = <&pm8998_l26>;
 	vdda-phy-max-microamp = <51400>;
 	vdda-pll-max-microamp = <14600>;
 	vddp-ref-clk-max-microamp = <100>;
@@ -33,9 +33,9 @@
 &ufs1 {
 	vdd-hba-supply = <&gdsc_ufs>;
 	vdd-hba-fixed-regulator;
-	vcc-supply = <&pmcobalt_l20>;
-	vccq-supply = <&pmcobalt_l26>;
-	vccq2-supply = <&pmcobalt_s4>;
+	vcc-supply = <&pm8998_l20>;
+	vccq-supply = <&pm8998_l26>;
+	vccq2-supply = <&pm8998_s4>;
 	vcc-max-microamp = <750000>;
 	vccq-max-microamp = <560000>;
 	vccq2-max-microamp = <750000>;
@@ -47,11 +47,11 @@
 };
 
 &sdhc_2 {
-	vdd-supply = <&pmcobalt_l21>;
+	vdd-supply = <&pm8998_l21>;
 	qcom,vdd-voltage-level = <2950000 2960000>;
 	qcom,vdd-current-level = <200 800000>;
 
-	vdd-io-supply = <&pmcobalt_l13>;
+	vdd-io-supply = <&pm8998_l13>;
 	qcom,vdd-io-voltage-level = <1808000 2960000>;
 	qcom,vdd-io-current-level = <200 22000>;
 
@@ -74,7 +74,7 @@
 	pinctrl-0 = <&uart_console_active>;
 };
 
-&pmcobalt_gpios {
+&pm8998_gpios {
 	/* GPIO 6 for Vol+ Key */
 	gpio@c500 {
 		status = "okay";
@@ -94,7 +94,7 @@
 
 		vol_up {
 			label = "volume_up";
-			gpios = <&pmcobalt_gpios 6 0x1>;
+			gpios = <&pm8998_gpios 6 0x1>;
 			linux,input-type = <1>;
 			linux,code = <115>;
 			gpio-key,wakeup;
@@ -103,7 +103,7 @@
 	};
 
 	sound-tavil {
-		qcom,model = "msmcobalt-skuk-tavil-snd-card";
+		qcom,model = "msm8998-skuk-tavil-snd-card";
 
 		qcom,audio-routing =
 			"AIF4 VI", "MCLK",
@@ -203,10 +203,10 @@
 	};
 };
 
-&pmicobalt_fg {
+&pmi8998_fg {
 	qcom,battery-data = <&qrd_batterydata>;
 };
 
-&pmicobalt_haptics {
+&pmi8998_haptics {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-qrd-vr1.dts b/arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dts
index e53912071502..f5780529c99a 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-qrd-vr1.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dts
@@ -13,11 +13,11 @@
 
 /dts-v1/;
 
-#include "msmcobalt.dtsi"
-#include "msmcobalt-qrd-vr1.dtsi"
+#include "msm8998.dtsi"
+#include "msm8998-qrd-vr1.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT VR1 Board";
-	compatible = "qcom,msmcobalt-qrd", "qcom,msmcobalt", "qcom,qrd";
+	model = "Qualcomm Technologies, Inc. MSM 8998 VR1 Board";
+	compatible = "qcom,msm8998-qrd", "qcom,msm8998", "qcom,qrd";
 	qcom,board-id = <0x02000b 0x80>;
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-qrd-vr1.dtsi b/arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dtsi
index 71fd5cc1383f..ccdfe7ee03f6 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-qrd-vr1.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-qrd-vr1.dtsi
@@ -11,17 +11,17 @@
  */
 
 #include <dt-bindings/interrupt-controller/irq.h>
-#include "msmcobalt-pinctrl.dtsi"
-#include "msmcobalt-camera-sensor-qrd-vr1.dtsi"
+#include "msm8998-pinctrl.dtsi"
+#include "msm8998-camera-sensor-qrd-vr1.dtsi"
 
 &blsp1_uart3_hs {
 	status = "ok";
 };
 
 &ufsphy1 {
-	vdda-phy-supply = <&pmcobalt_l1>;
-	vdda-pll-supply = <&pmcobalt_l2>;
-	vddp-ref-clk-supply = <&pmcobalt_l26>;
+	vdda-phy-supply = <&pm8998_l1>;
+	vdda-pll-supply = <&pm8998_l2>;
+	vddp-ref-clk-supply = <&pm8998_l26>;
 	vdda-phy-max-microamp = <51400>;
 	vdda-pll-max-microamp = <14600>;
 	vddp-ref-clk-max-microamp = <100>;
@@ -32,9 +32,9 @@
 &ufs1 {
 	vdd-hba-supply = <&gdsc_ufs>;
 	vdd-hba-fixed-regulator;
-	vcc-supply = <&pmcobalt_l20>;
-	vccq-supply = <&pmcobalt_l26>;
-	vccq2-supply = <&pmcobalt_s4>;
+	vcc-supply = <&pm8998_l20>;
+	vccq-supply = <&pm8998_l26>;
+	vccq2-supply = <&pm8998_s4>;
 	vcc-max-microamp = <750000>;
 	vccq-max-microamp = <560000>;
 	vccq2-max-microamp = <750000>;
@@ -46,11 +46,11 @@
 };
 
 &sdhc_2 {
-	vdd-supply = <&pmcobalt_l21>;
+	vdd-supply = <&pm8998_l21>;
 	qcom,vdd-voltage-level = <2950000 2960000>;
 	qcom,vdd-current-level = <200 800000>;
 
-	vdd-io-supply = <&pmcobalt_l13>;
+	vdd-io-supply = <&pm8998_l13>;
 	qcom,vdd-io-voltage-level = <1808000 2960000>;
 	qcom,vdd-io-current-level = <200 22000>;
 
@@ -73,7 +73,7 @@
 	pinctrl-0 = <&uart_console_active>;
 };
 
-&pmcobalt_gpios {
+&pm8998_gpios {
 	/* GPIO 6 for Vol+ Key */
 	gpio@c500 {
 		status = "okay";
@@ -93,7 +93,7 @@
 
 		vol_up {
 			label = "volume_up";
-			gpios = <&pmcobalt_gpios 6 0x1>;
+			gpios = <&pm8998_gpios 6 0x1>;
 			linux,input-type = <1>;
 			linux,code = <115>;
 			gpio-key,wakeup;
@@ -102,7 +102,7 @@
 	};
 
 	sound-tavil {
-		qcom,model = "msmcobalt-qvr-tavil-snd-card";
+		qcom,model = "msm8998-qvr-tavil-snd-card";
 		qcom,audio-routing =
 			"RX_BIAS", "MCLK",
 			"MADINPUT", "MCLK",
@@ -137,10 +137,10 @@
 	};
 };
 
-&pmicobalt_fg {
+&pmi8998_fg {
 	qcom,battery-data = <&qrd_batterydata>;
 };
 
-&pmicobalt_haptics {
+&pmi8998_haptics {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-qrd.dts b/arch/arm/boot/dts/qcom/msm8998-qrd.dts
index d95507b505c2..952b9a5cec6f 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-qrd.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-qrd.dts
@@ -13,11 +13,11 @@
 
 /dts-v1/;
 
-#include "msmcobalt.dtsi"
-#include "msmcobalt-qrd.dtsi"
+#include "msm8998.dtsi"
+#include "msm8998-qrd.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT QRD";
-	compatible = "qcom,msmcobalt-qrd", "qcom,msmcobalt", "qcom,qrd";
+	model = "Qualcomm Technologies, Inc. MSM 8998 QRD";
+	compatible = "qcom,msm8998-qrd", "qcom,msm8998", "qcom,qrd";
 	qcom,board-id = <11 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-qrd.dtsi b/arch/arm/boot/dts/qcom/msm8998-qrd.dtsi
index 6483453ec5fa..41f9c3c69fe9 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-qrd.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-qrd.dtsi
@@ -11,17 +11,18 @@
  */
 
 #include <dt-bindings/interrupt-controller/irq.h>
-#include "msmcobalt-pinctrl.dtsi"
-#include "msmcobalt-camera-sensor-qrd.dtsi"
+#include "msm8998-mtp.dtsi"
+#include "msm8998-pinctrl.dtsi"
+#include "msm8998-camera-sensor-qrd.dtsi"
 / {
 	bluetooth: bt_wcn3990 {
 		compatible = "qca,wcn3990";
-		qca,bt-vdd-io-supply = <&pmcobalt_s3>;
-		qca,bt-vdd-xtal-supply = <&pmcobalt_s5>;
-		qca,bt-vdd-core-supply = <&pmcobalt_l7_pin_ctrl>;
-		qca,bt-vdd-pa-supply = <&pmcobalt_l17_pin_ctrl>;
-		qca,bt-vdd-ldo-supply = <&pmcobalt_l25_pin_ctrl>;
-		qca,bt-chip-pwd-supply = <&pmicobalt_bob_pin1>;
+		qca,bt-vdd-io-supply = <&pm8998_s3>;
+		qca,bt-vdd-xtal-supply = <&pm8998_s5>;
+		qca,bt-vdd-core-supply = <&pm8998_l7_pin_ctrl>;
+		qca,bt-vdd-pa-supply = <&pm8998_l17_pin_ctrl>;
+		qca,bt-vdd-ldo-supply = <&pm8998_l25_pin_ctrl>;
+		qca,bt-chip-pwd-supply = <&pmi8998_bob_pin1>;
 
 		qca,bt-vdd-io-voltage-level = <1352000 1352000>;
 		qca,bt-vdd-xtal-voltage-level = <2040000 2040000>;
@@ -43,9 +44,9 @@
 };
 
 &ufsphy1 {
-	vdda-phy-supply = <&pmcobalt_l1>;
-	vdda-pll-supply = <&pmcobalt_l2>;
-	vddp-ref-clk-supply = <&pmcobalt_l26>;
+	vdda-phy-supply = <&pm8998_l1>;
+	vdda-pll-supply = <&pm8998_l2>;
+	vddp-ref-clk-supply = <&pm8998_l26>;
 	vdda-phy-max-microamp = <51400>;
 	vdda-pll-max-microamp = <14600>;
 	vddp-ref-clk-max-microamp = <100>;
@@ -56,9 +57,9 @@
 &ufs1 {
 	vdd-hba-supply = <&gdsc_ufs>;
 	vdd-hba-fixed-regulator;
-	vcc-supply = <&pmcobalt_l20>;
-	vccq-supply = <&pmcobalt_l26>;
-	vccq2-supply = <&pmcobalt_s4>;
+	vcc-supply = <&pm8998_l20>;
+	vccq-supply = <&pm8998_l26>;
+	vccq2-supply = <&pm8998_s4>;
 	vcc-max-microamp = <750000>;
 	vccq-max-microamp = <560000>;
 	vccq2-max-microamp = <750000>;
@@ -70,11 +71,11 @@
 };
 
 &sdhc_2 {
-	vdd-supply = <&pmcobalt_l21>;
+	vdd-supply = <&pm8998_l21>;
 	qcom,vdd-voltage-level = <2950000 2960000>;
 	qcom,vdd-current-level = <200 800000>;
 
-	vdd-io-supply = <&pmcobalt_l13>;
+	vdd-io-supply = <&pm8998_l13>;
 	qcom,vdd-io-voltage-level = <1808000 2960000>;
 	qcom,vdd-io-current-level = <200 22000>;
 
@@ -97,7 +98,7 @@
 	pinctrl-0 = <&uart_console_active>;
 };
 
-&pmcobalt_gpios {
+&pm8998_gpios {
 	/* GPIO 6 for Vol+ Key */
 	gpio@c500 {
 		status = "okay";
@@ -166,8 +167,8 @@
 		reg = <0x20>;
 		interrupt-parent = <&tlmm>;
 		interrupts = <125 0x2008>;
-		vdd-supply = <&pmcobalt_l6>;
-		avdd-supply = <&pmcobalt_l28>;
+		vdd-supply = <&pm8998_l6>;
+		avdd-supply = <&pm8998_l28>;
 		synaptics,vdd-voltage = <1808000 1808000>;
 		synaptics,avdd-voltage = <3008000 3008000>;
 		synaptics,vdd-current = <40000>;
@@ -192,7 +193,7 @@
 		qcom,nq-irq = <&tlmm 92 0x00>;
 		qcom,nq-ven = <&tlmm 12 0x00>;
 		qcom,nq-firm = <&tlmm 93 0x00>;
-		qcom,nq-clkreq = <&pmcobalt_gpios 21 0x00>;
+		qcom,nq-clkreq = <&pm8998_gpios 21 0x00>;
 		qcom,nq-esepwr = <&tlmm 116 0x00>;
 		interrupt-parent = <&tlmm>;
 		qcom,clk-src = "BBCLK3";
@@ -263,7 +264,7 @@
 	qcom,qpnp-labibb-mode = "lcd";
 };
 
-&pmicobalt_wled {
+&pmi8998_wled {
 	qcom,led-strings-list = [01 02];
 };
 
@@ -381,11 +382,11 @@
 	};
 };
 
-&pmicobalt_haptics {
+&pmi8998_haptics {
 	status = "okay";
 };
 
-&pmcobalt_vadc {
+&pm8998_vadc {
 	chan@83 {
 		label = "vph_pwr";
 		reg = <0x83>;
@@ -442,7 +443,7 @@
 	};
 };
 
-&pmcobalt_adc_tm {
+&pm8998_adc_tm {
 	chan@83 {
 		label = "vph_pwr";
 		reg = <0x83>;
@@ -503,7 +504,7 @@
 
 		vol_up {
 			label = "volume_up";
-			gpios = <&pmcobalt_gpios 6 0x1>;
+			gpios = <&pm8998_gpios 6 0x1>;
 			linux,input-type = <1>;
 			linux,code = <115>;
 			gpio-key,wakeup;
@@ -512,7 +513,7 @@
 
 		cam_snapshot {
 			label = "cam_snapshot";
-			gpios = <&pmcobalt_gpios 7 0x1>;
+			gpios = <&pm8998_gpios 7 0x1>;
 			linux,input-type = <1>;
 			linux,code = <766>;
 			gpio-key,wakeup;
@@ -521,7 +522,7 @@
 
 		cam_focus {
 			label = "cam_focus";
-			gpios = <&pmcobalt_gpios 8 0x1>;
+			gpios = <&pm8998_gpios 8 0x1>;
 			linux,input-type = <1>;
 			linux,code = <528>;
 			gpio-key,wakeup;
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi b/arch/arm/boot/dts/qcom/msm8998-regulator.dtsi
index 32cf1663cf43..518ad33c63ea 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-regulator.dtsi
@@ -10,16 +10,16 @@
  * GNU General Public License for more details.
  */
 
-#include <dt-bindings/clock/msm-clocks-cobalt.h>
+#include <dt-bindings/clock/msm-clocks-8998.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 &rpm_bus {
-	/* PMCOBALT S1 + S6 = VDD_CX supply */
+	/* PM8998 S1 + S6 = VDD_CX supply */
 	rpm-regulator-smpa1 {
 		status = "okay";
-		pmcobalt_s1_level: regulator-s1-level {
+		pm8998_s1_level: regulator-s1-level {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s1_level";
+			regulator-name = "pm8998_s1_level";
 			qcom,set = <3>;
 			regulator-min-microvolt =
 				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
@@ -28,9 +28,9 @@
 			qcom,use-voltage-level;
 		};
 
-		pmcobalt_s1_floor_level: regulator-s1-floor-level {
+		pm8998_s1_floor_level: regulator-s1-floor-level {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s1_floor_level";
+			regulator-name = "pm8998_s1_floor_level";
 			qcom,set = <3>;
 			regulator-min-microvolt =
 				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
@@ -40,9 +40,9 @@
 			qcom,always-send-voltage;
 		};
 
-		pmcobalt_s1_level_ao: regulator-s1-level-ao {
+		pm8998_s1_level_ao: regulator-s1-level-ao {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s1_level_ao";
+			regulator-name = "pm8998_s1_level_ao";
 			qcom,set = <1>;
 			regulator-min-microvolt =
 				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
@@ -54,7 +54,7 @@
 
 	rpm-regulator-smpa2 {
 		status = "okay";
-		pmcobalt_s2: regulator-s2 {
+		pm8998_s2: regulator-s2 {
 			regulator-min-microvolt = <1128000>;
 			regulator-max-microvolt = <1128000>;
 			status = "okay";
@@ -63,7 +63,7 @@
 
 	rpm-regulator-smpa3 {
 		status = "okay";
-		pmcobalt_s3: regulator-s3 {
+		pm8998_s3: regulator-s3 {
 			regulator-min-microvolt = <1352000>;
 			regulator-max-microvolt = <1352000>;
 			status = "okay";
@@ -72,7 +72,7 @@
 
 	rpm-regulator-smpa4 {
 		status = "okay";
-		pmcobalt_s4: regulator-s4 {
+		pm8998_s4: regulator-s4 {
 			regulator-min-microvolt = <1800000>;
 			regulator-max-microvolt = <1800000>;
 			status = "okay";
@@ -81,7 +81,7 @@
 
 	rpm-regulator-smpa5 {
 		status = "okay";
-		pmcobalt_s5: regulator-s5 {
+		pm8998_s5: regulator-s5 {
 			regulator-min-microvolt = <1904000>;
 			regulator-max-microvolt = <2040000>;
 			status = "okay";
@@ -90,7 +90,7 @@
 
 	rpm-regulator-smpa7 {
 		status = "okay";
-		pmcobalt_s7: regulator-s7 {
+		pm8998_s7: regulator-s7 {
 			regulator-min-microvolt = <900000>;
 			regulator-max-microvolt = <1028000>;
 			status = "okay";
@@ -99,19 +99,19 @@
 
 	rpm-regulator-smpa8 {
 		status = "okay";
-		pmcobalt_s8: regulator-s8 {
+		pm8998_s8: regulator-s8 {
 			regulator-min-microvolt = <800000>;
 			regulator-max-microvolt = <800000>;
 			status = "okay";
 		};
 	};
 
-	/* PMCOBALT S9 = VDD_MX supply */
+	/* PM8998 S9 = VDD_MX supply */
 	rpm-regulator-smpa9 {
 		status = "okay";
-		pmcobalt_s9_level: regulator-s9-level {
+		pm8998_s9_level: regulator-s9-level {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s9_level";
+			regulator-name = "pm8998_s9_level";
 			qcom,set = <3>;
 			regulator-min-microvolt =
 				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
@@ -120,9 +120,9 @@
 			qcom,use-voltage-level;
 		};
 
-		pmcobalt_s9_floor_level: regulator-s9-floor-level {
+		pm8998_s9_floor_level: regulator-s9-floor-level {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s9_floor_level";
+			regulator-name = "pm8998_s9_floor_level";
 			qcom,set = <3>;
 			regulator-min-microvolt =
 				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
@@ -132,9 +132,9 @@
 			qcom,always-send-voltage;
 		};
 
-		pmcobalt_s9_level_ao: regulator-s9-level-ao {
+		pm8998_s9_level_ao: regulator-s9-level-ao {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_s9_level_ao";
+			regulator-name = "pm8998_s9_level_ao";
 			qcom,set = <1>;
 			regulator-min-microvolt =
 				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
@@ -146,10 +146,10 @@
 
 	rpm-regulator-ldoa1 {
 		status = "okay";
-		pmcobalt_l1: regulator-l1 {
+		pm8998_l1: regulator-l1 {
 			regulator-min-microvolt = <880000>;
 			regulator-max-microvolt = <880000>;
-			proxy-supply = <&pmcobalt_l1>;
+			proxy-supply = <&pm8998_l1>;
 			qcom,proxy-consumer-enable;
 			qcom,proxy-consumer-current = <73400>;
 			status = "okay";
@@ -158,10 +158,10 @@
 
 	rpm-regulator-ldoa2 {
 		status = "okay";
-		pmcobalt_l2: regulator-l2 {
+		pm8998_l2: regulator-l2 {
 			regulator-min-microvolt = <1200000>;
 			regulator-max-microvolt = <1200000>;
-			proxy-supply = <&pmcobalt_l2>;
+			proxy-supply = <&pm8998_l2>;
 			qcom,proxy-consumer-enable;
 			qcom,proxy-consumer-current = <12560>;
 			status = "okay";
@@ -170,19 +170,19 @@
 
 	rpm-regulator-ldoa3 {
 		status = "okay";
-		pmcobalt_l3: regulator-l3 {
+		pm8998_l3: regulator-l3 {
 			regulator-min-microvolt = <1000000>;
 			regulator-max-microvolt = <1000000>;
 			status = "okay";
 		};
 	};
 
-	/* PMCOBALT L4 = VDD_SSC_MX supply */
+	/* PM8998 L4 = VDD_SSC_MX supply */
 	rpm-regulator-ldoa4 {
 		status = "okay";
-		pmcobalt_l4_level: regulator-l4-level {
+		pm8998_l4_level: regulator-l4-level {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l4_level";
+			regulator-name = "pm8998_l4_level";
 			qcom,set = <3>;
 			regulator-min-microvolt =
 				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
@@ -191,9 +191,9 @@
 			qcom,use-voltage-level;
 		};
 
-		pmcobalt_l4_floor_level: regulator-l4-floor-level {
+		pm8998_l4_floor_level: regulator-l4-floor-level {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l4_floor_level";
+			regulator-name = "pm8998_l4_floor_level";
 			qcom,set = <3>;
 			regulator-min-microvolt =
 				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
@@ -206,7 +206,7 @@
 
 	rpm-regulator-ldoa5 {
 		status = "okay";
-		pmcobalt_l5: regulator-l5 {
+		pm8998_l5: regulator-l5 {
 			regulator-min-microvolt = <800000>;
 			regulator-max-microvolt = <800000>;
 			/* Force NPM follows HW0_EN */
@@ -217,7 +217,7 @@
 
 	rpm-regulator-ldoa6 {
 		status = "okay";
-		pmcobalt_l6: regulator-l6 {
+		pm8998_l6: regulator-l6 {
 			regulator-min-microvolt = <1808000>;
 			regulator-max-microvolt = <1808000>;
 			status = "okay";
@@ -226,15 +226,15 @@
 
 	rpm-regulator-ldoa7 {
 		status = "okay";
-		pmcobalt_l7: regulator-l7 {
+		pm8998_l7: regulator-l7 {
 			regulator-min-microvolt = <1800000>;
 			regulator-max-microvolt = <1800000>;
 			status = "okay";
 		};
 
-		pmcobalt_l7_pin_ctrl: regulator-l7-pin-ctrl {
+		pm8998_l7_pin_ctrl: regulator-l7-pin-ctrl {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l7_pin_ctrl";
+			regulator-name = "pm8998_l7_pin_ctrl";
 			qcom,set = <3>;
 			regulator-min-microvolt = <1800000>;
 			regulator-max-microvolt = <1800000>;
@@ -247,7 +247,7 @@
 
 	rpm-regulator-ldoa8 {
 		status = "okay";
-		pmcobalt_l8: regulator-l8 {
+		pm8998_l8: regulator-l8 {
 			regulator-min-microvolt = <1200000>;
 			regulator-max-microvolt = <1200000>;
 			status = "okay";
@@ -256,7 +256,7 @@
 
 	rpm-regulator-ldoa9 {
 		status = "okay";
-		pmcobalt_l9: regulator-l9 {
+		pm8998_l9: regulator-l9 {
 			regulator-min-microvolt = <1808000>;
 			regulator-max-microvolt = <2960000>;
 			status = "okay";
@@ -265,7 +265,7 @@
 
 	rpm-regulator-ldoa10 {
 		status = "okay";
-		pmcobalt_l10: regulator-l10 {
+		pm8998_l10: regulator-l10 {
 			regulator-min-microvolt = <1808000>;
 			regulator-max-microvolt = <2960000>;
 			status = "okay";
@@ -274,7 +274,7 @@
 
 	rpm-regulator-ldoa11 {
 		status = "okay";
-		pmcobalt_l11: regulator-l11 {
+		pm8998_l11: regulator-l11 {
 			regulator-min-microvolt = <1000000>;
 			regulator-max-microvolt = <1000000>;
 			status = "okay";
@@ -283,7 +283,7 @@
 
 	rpm-regulator-ldoa12 {
 		status = "okay";
-		pmcobalt_l12: regulator-l12 {
+		pm8998_l12: regulator-l12 {
 			regulator-min-microvolt = <1800000>;
 			regulator-max-microvolt = <1800000>;
 			status = "okay";
@@ -292,7 +292,7 @@
 
 	rpm-regulator-ldoa13 {
 		status = "okay";
-		pmcobalt_l13: regulator-l13 {
+		pm8998_l13: regulator-l13 {
 			regulator-min-microvolt = <1808000>;
 			regulator-max-microvolt = <2960000>;
 			status = "okay";
@@ -301,10 +301,10 @@
 
 	rpm-regulator-ldoa14 {
 		status = "okay";
-		pmcobalt_l14: regulator-l14 {
+		pm8998_l14: regulator-l14 {
 			regulator-min-microvolt = <1880000>;
 			regulator-max-microvolt = <1880000>;
-			proxy-supply = <&pmcobalt_l14>;
+			proxy-supply = <&pm8998_l14>;
 			qcom,proxy-consumer-enable;
 			qcom,proxy-consumer-current = <32000>;
 			status = "okay";
@@ -313,7 +313,7 @@
 
 	rpm-regulator-ldoa15 {
 		status = "okay";
-		pmcobalt_l15: regulator-l15 {
+		pm8998_l15: regulator-l15 {
 			regulator-min-microvolt = <1800000>;
 			regulator-max-microvolt = <1800000>;
 			status = "okay";
@@ -322,7 +322,7 @@
 
 	rpm-regulator-ldoa16 {
 		status = "okay";
-		pmcobalt_l16: regulator-l16 {
+		pm8998_l16: regulator-l16 {
 			regulator-min-microvolt = <2704000>;
 			regulator-max-microvolt = <2704000>;
 			status = "okay";
@@ -331,15 +331,15 @@
 
 	rpm-regulator-ldoa17 {
 		status = "okay";
-		pmcobalt_l17: regulator-l17 {
+		pm8998_l17: regulator-l17 {
 			regulator-min-microvolt = <1304000>;
 			regulator-max-microvolt = <1304000>;
 			status = "okay";
 		};
 
-		pmcobalt_l17_pin_ctrl: regulator-l17-pin-ctrl {
+		pm8998_l17_pin_ctrl: regulator-l17-pin-ctrl {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l17_pin_ctrl";
+			regulator-name = "pm8998_l17_pin_ctrl";
 			qcom,set = <3>;
 			regulator-min-microvolt = <1304000>;
 			regulator-max-microvolt = <1304000>;
@@ -352,7 +352,7 @@
 
 	rpm-regulator-ldoa18 {
 		status = "okay";
-		pmcobalt_l18: regulator-l18 {
+		pm8998_l18: regulator-l18 {
 			regulator-min-microvolt = <2704000>;
 			regulator-max-microvolt = <2704000>;
 			status = "okay";
@@ -361,7 +361,7 @@
 
 	rpm-regulator-ldoa19 {
 		status = "okay";
-		pmcobalt_l19: regulator-l19 {
+		pm8998_l19: regulator-l19 {
 			regulator-min-microvolt = <3008000>;
 			regulator-max-microvolt = <3008000>;
 			status = "okay";
@@ -370,7 +370,7 @@
 
 	rpm-regulator-ldoa20 {
 		status = "okay";
-		pmcobalt_l20: regulator-l20 {
+		pm8998_l20: regulator-l20 {
 			regulator-min-microvolt = <2960000>;
 			regulator-max-microvolt = <2960000>;
 			status = "okay";
@@ -379,7 +379,7 @@
 
 	rpm-regulator-ldoa21 {
 		status = "okay";
-		pmcobalt_l21: regulator-l21 {
+		pm8998_l21: regulator-l21 {
 			regulator-min-microvolt = <2960000>;
 			regulator-max-microvolt = <2960000>;
 			status = "okay";
@@ -388,7 +388,7 @@
 
 	rpm-regulator-ldoa22 {
 		status = "okay";
-		pmcobalt_l22: regulator-l22 {
+		pm8998_l22: regulator-l22 {
 			regulator-min-microvolt = <2864000>;
 			regulator-max-microvolt = <2864000>;
 			status = "okay";
@@ -397,7 +397,7 @@
 
 	rpm-regulator-ldoa23 {
 		status = "okay";
-		pmcobalt_l23: regulator-l23 {
+		pm8998_l23: regulator-l23 {
 			regulator-min-microvolt = <3312000>;
 			regulator-max-microvolt = <3312000>;
 			status = "okay";
@@ -406,7 +406,7 @@
 
 	rpm-regulator-ldoa24 {
 		status = "okay";
-		pmcobalt_l24: regulator-l24 {
+		pm8998_l24: regulator-l24 {
 			regulator-min-microvolt = <3088000>;
 			regulator-max-microvolt = <3088000>;
 			status = "okay";
@@ -414,15 +414,15 @@
 	};
 	rpm-regulator-ldoa25 {
 		status = "okay";
-		pmcobalt_l25: regulator-l25 {
+		pm8998_l25: regulator-l25 {
 			regulator-min-microvolt = <3104000>;
 			regulator-max-microvolt = <3312000>;
 			status = "okay";
 		};
 
-		pmcobalt_l25_pin_ctrl: regulator-l25-pin-ctrl {
+		pm8998_l25_pin_ctrl: regulator-l25-pin-ctrl {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l25_pin_ctrl";
+			regulator-name = "pm8998_l25_pin_ctrl";
 			qcom,set = <3>;
 			regulator-min-microvolt = <3104000>;
 			regulator-max-microvolt = <3312000>;
@@ -435,19 +435,19 @@
 
 	rpm-regulator-ldoa26 {
 		status = "okay";
-		pmcobalt_l26: regulator-l26 {
+		pm8998_l26: regulator-l26 {
 			regulator-min-microvolt = <1200000>;
 			regulator-max-microvolt = <1200000>;
 			status = "okay";
 		};
 	};
 
-	/* PMCOBALT L27 = VDD_SSC_CX supply */
+	/* PM8998 L27 = VDD_SSC_CX supply */
 	rpm-regulator-ldoa27 {
 		status = "okay";
-		pmcobalt_l27_level: regulator-l27-level {
+		pm8998_l27_level: regulator-l27-level {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l27_level";
+			regulator-name = "pm8998_l27_level";
 			qcom,set = <3>;
 			regulator-min-microvolt =
 				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
@@ -456,9 +456,9 @@
 			qcom,use-voltage-level;
 		};
 
-		pmcobalt_l27_floor_level: regulator-l27-floor-level {
+		pm8998_l27_floor_level: regulator-l27-floor-level {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmcobalt_l27_floor_level";
+			regulator-name = "pm8998_l27_floor_level";
 			qcom,set = <3>;
 			regulator-min-microvolt =
 				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
@@ -471,7 +471,7 @@
 
 	rpm-regulator-ldoa28 {
 		status = "okay";
-		pmcobalt_l28: regulator-l28 {
+		pm8998_l28: regulator-l28 {
 			regulator-min-microvolt = <3008000>;
 			regulator-max-microvolt = <3008000>;
 			status = "okay";
@@ -480,44 +480,44 @@
 
 	rpm-regulator-vsa1 {
 		status = "okay";
-		pmcobalt_lvs1: regulator-lvs1 {
+		pm8998_lvs1: regulator-lvs1 {
 			status = "okay";
 		};
 	};
 
 	rpm-regulator-vsa2 {
 		status = "okay";
-		pmcobalt_lvs2: regulator-lvs2 {
+		pm8998_lvs2: regulator-lvs2 {
 			status = "okay";
 		};
 	};
 
 	rpm-regulator-bobb {
 		status = "okay";
-		pmicobalt_bob: regulator-bob {
+		pmi8998_bob: regulator-bob {
 			regulator-min-microvolt = <3312000>;
 			regulator-max-microvolt = <3600000>;
 			status = "okay";
 		};
-		pmicobalt_bob_pin1: regulator-bob-pin1 {
+		pmi8998_bob_pin1: regulator-bob-pin1 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmicobalt_bob_pin1";
+			regulator-name = "pm8998_bob_pin1";
 			qcom,set = <3>;
 			regulator-min-microvolt = <3312000>;
 			regulator-max-microvolt = <3600000>;
 			qcom,use-pin-ctrl-voltage1;
 		};
-		pmicobalt_bob_pin2: regulator-bob-pin2 {
+		pmi8998_bob_pin2: regulator-bob-pin2 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmicobalt_bob_pin2";
+			regulator-name = "pm8998_bob_pin2";
 			qcom,set = <3>;
 			regulator-min-microvolt = <3312000>;
 			regulator-max-microvolt = <3600000>;
 			qcom,use-pin-ctrl-voltage2;
 		};
-		pmicobalt_bob_pin3: regulator-bob-pin3 {
+		pmi8998_bob_pin3: regulator-bob-pin3 {
 			compatible = "qcom,rpm-smd-regulator";
-			regulator-name = "pmicobalt_bob_pin3";
+			regulator-name = "pm8998_bob_pin3";
 			qcom,set = <3>;
 			regulator-min-microvolt = <3312000>;
 			regulator-max-microvolt = <3600000>;
@@ -538,21 +538,21 @@
 		};
 	};
 
-	qcom,pmcobalt@1 {
-		pmcobalt_s10: regulator@2f00 {
+	qcom,pm8998@1 {
+		pm8998_s10: regulator@2f00 {
 			compatible = "qcom,qpnp-regulator";
 			reg = <0x2f00 0x100>;
-			regulator-name = "pmcobalt_s10";
+			regulator-name = "pm8998_s10";
 			regulator-min-microvolt = <572000>;
 			regulator-max-microvolt = <1112000>;
 			qcom,enable-time = <500>;
 			regulator-always-on;
 		};
 
-		pmcobalt_s13: regulator@3800 {
+		pm8998_s13: regulator@3800 {
 			compatible = "qcom,qpnp-regulator";
 			reg = <0x3800 0x100>;
-			regulator-name = "pmcobalt_s13";
+			regulator-name = "pm8998_s13";
 			regulator-min-microvolt = <572000>;
 			regulator-max-microvolt = <1112000>;
 			qcom,enable-time = <500>;
@@ -577,7 +577,7 @@
 &soc {
 /* CPR controller regulators */
 	apc0_cpr: cprh-ctrl@179c8000 {
-		compatible = "qcom,cprh-msmcobalt-v1-kbss-regulator";
+		compatible = "qcom,cprh-msm8998-v1-kbss-regulator";
 		reg = <0x179c8000 0x4000>, <0x00784000 0x1000>;
 		reg-names = "cpr_ctrl", "fuse_base";
 		clocks = <&clock_gcc clk_gcc_hmss_rbcpr_clk>;
@@ -614,7 +614,7 @@
 			"PWR_CPRH_STATUS", "APCLUS0_L2_SAW4_PMIC_STS";
 
 		qcom,cpr-aging-ref-voltage = <1112000>;
-		vdd-supply = <&pmcobalt_s10>;
+		vdd-supply = <&pm8998_s10>;
 
 		thread@0 {
 			qcom,cpr-thread-id = <0>;
@@ -750,7 +750,7 @@
 	};
 
 	apc1_cpr: cprh-ctrl@179c4000{
-		compatible = "qcom,cprh-msmcobalt-v1-kbss-regulator";
+		compatible = "qcom,cprh-msm8998-v1-kbss-regulator";
 		reg = <0x179c4000 0x4000>, <0x00784000 0x1000>;
 		reg-names = "cpr_ctrl", "fuse_base";
 		clocks = <&clock_gcc clk_gcc_hmss_rbcpr_clk>;
@@ -787,7 +787,7 @@
 			"PERF_CPRH_STATUS", "APCLUS1_L2_SAW4_PMIC_STS";
 
 		qcom,cpr-aging-ref-voltage = <1112000>;
-		vdd-supply = <&pmcobalt_s13>;
+		vdd-supply = <&pm8998_s13>;
 
 		thread@0 {
 			qcom,cpr-thread-id = <0>;
@@ -943,7 +943,7 @@
 	};
 
 	gfx_cpr: cpr4-ctrl@5061000 {
-		compatible = "qcom,cpr4-msmcobalt-v1-mmss-regulator";
+		compatible = "qcom,cpr4-msm8998-v1-mmss-regulator";
 		reg =	<0x05061000 0x4000>,
 			<0x00784000 0x1000>,
 			<0x05065204 0x4>;
@@ -1121,7 +1121,7 @@
 	};
 };
 
-&pmicobalt_charger {
+&pmi8998_charger {
 	smb2_vbus: qcom,smb2-vbus {
 		regulator-name = "smb2-vbus";
 	};
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-rumi.dts b/arch/arm/boot/dts/qcom/msm8998-rumi.dts
index 81927abd6886..eaeb711efba6 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-rumi.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-rumi.dts
@@ -14,12 +14,12 @@
 /dts-v1/;
 /memreserve/ 0x90000000 0x00000100;
 
-#include "msmcobalt.dtsi"
-#include "msmcobalt-rumi.dtsi"
+#include "msm8998.dtsi"
+#include "msm8998-rumi.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT RUMI";
-	compatible = "qcom,msmcobalt-rumi", "qcom,msmcobalt", "qcom,rumi";
+	model = "Qualcomm Technologies, Inc. MSM 8998 RUMI";
+	compatible = "qcom,msm8998-rumi", "qcom,msm8998", "qcom,rumi";
 	qcom,board-id = <15 0>;
 };
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-rumi.dtsi b/arch/arm/boot/dts/qcom/msm8998-rumi.dtsi
index 105a83b56056..d5fd190c938d 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-rumi.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-rumi.dtsi
@@ -10,7 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include "msmcobalt-pinctrl.dtsi"
+#include "msm8998-pinctrl.dtsi"
 &uartblsp2dm1 {
 	status = "ok";
 };
@@ -20,9 +20,9 @@
 	reg = <0x1da7000 0xda8>, /* PHY regs */
 		<0x1db8000 0x100>; /* U11 user regs */
 	reg-names = "phy_mem", "u11_user";
-	vdda-phy-supply = <&pmcobalt_l1>;
-	vdda-pll-supply = <&pmcobalt_l2>;
-	vddp-ref-clk-supply = <&pmcobalt_l26>;
+	vdda-phy-supply = <&pm8998_l1>;
+	vdda-pll-supply = <&pm8998_l2>;
+	vddp-ref-clk-supply = <&pm8998_l26>;
 	vdda-phy-max-microamp = <51400>;
 	vdda-pll-max-microamp = <14600>;
 	vddp-ref-clk-max-microamp = <100>;
@@ -77,9 +77,9 @@
 &ufs1 {
 	vdd-hba-supply = <&gdsc_ufs>;
 	vdd-hba-fixed-regulator;
-	vcc-supply = <&pmcobalt_l20>;
-	vccq-supply = <&pmcobalt_l26>;
-	vccq2-supply = <&pmcobalt_s4>;
+	vcc-supply = <&pm8998_l20>;
+	vccq-supply = <&pm8998_l26>;
+	vccq2-supply = <&pm8998_s4>;
 	vcc-max-microamp = <750000>;
 	vccq-max-microamp = <560000>;
 	vccq2-max-microamp = <750000>;
@@ -95,11 +95,11 @@
 };
 
 &sdhc_2 {
-	vdd-supply = <&pmcobalt_l21>;
+	vdd-supply = <&pm8998_l21>;
 	qcom,vdd-voltage-level = <2950000 2960000>;
 	qcom,vdd-current-level = <200 800000>;
 
-	vdd-io-supply = <&pmcobalt_l13>;
+	vdd-io-supply = <&pm8998_l13>;
 	qcom,vdd-io-voltage-level = <1808000 2960000>;
 	qcom,vdd-io-current-level = <200 22000>;
 
@@ -267,14 +267,14 @@
 };
 
 &spmi_bus {
-	qcom,pmicobalt@3 {
+	qcom,pmi8998@3 {
 		flash_led: qcom,leds@d300 {
 			status = "disabled";
 		};
 	};
 };
 
-&pmicobalt_charger {
+&pmi8998_charger {
 	qcom,suspend-input;
 };
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-sim.dts b/arch/arm/boot/dts/qcom/msm8998-sim.dts
index 69c047994c98..c92050ab20d6 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-sim.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-sim.dts
@@ -14,12 +14,12 @@
 /dts-v1/;
 /memreserve/ 0x90000000 0x00000100;
 
-#include "msmcobalt.dtsi"
-#include "msmcobalt-sim.dtsi"
+#include "msm8998.dtsi"
+#include "msm8998-sim.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT SIM";
-	compatible = "qcom,msmcobalt-sim", "qcom,msmcobalt", "qcom,sim";
+	model = "Qualcomm Technologies, Inc. MSM 8998 SIM";
+	compatible = "qcom,msm8998-sim", "qcom,msm8998", "qcom,sim";
 	qcom,board-id = <16 0>;
 };
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-sim.dtsi b/arch/arm/boot/dts/qcom/msm8998-sim.dtsi
index 4e6b1dd9211a..8a0f4b30121c 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-sim.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-sim.dtsi
@@ -10,7 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include "msmcobalt-pinctrl.dtsi"
+#include "msm8998-pinctrl.dtsi"
 
 &uartblsp2dm1 {
 	status = "ok";
@@ -19,9 +19,9 @@
 };
 
 &ufsphy1 {
-	vdda-phy-supply = <&pmcobalt_l1>;
-	vdda-pll-supply = <&pmcobalt_l2>;
-	vddp-ref-clk-supply = <&pmcobalt_l26>;
+	vdda-phy-supply = <&pm8998_l1>;
+	vdda-pll-supply = <&pm8998_l2>;
+	vddp-ref-clk-supply = <&pm8998_l26>;
 	vdda-phy-max-microamp = <51400>;
 	vdda-pll-max-microamp = <14600>;
 	vddp-ref-clk-max-microamp = <100>;
@@ -32,9 +32,9 @@
 &ufs1 {
 	vdd-hba-supply = <&gdsc_ufs>;
 	vdd-hba-fixed-regulator;
-	vcc-supply = <&pmcobalt_l20>;
-	vccq-supply = <&pmcobalt_l26>;
-	vccq2-supply = <&pmcobalt_s4>;
+	vcc-supply = <&pm8998_l20>;
+	vccq-supply = <&pm8998_l26>;
+	vccq2-supply = <&pm8998_s4>;
 	vcc-max-microamp = <750000>;
 	vccq-max-microamp = <560000>;
 	vccq2-max-microamp = <750000>;
@@ -50,11 +50,11 @@
 };
 
 &sdhc_2 {
-	vdd-supply = <&pmcobalt_l21>;
+	vdd-supply = <&pm8998_l21>;
 	qcom,vdd-voltage-level = <2950000 2960000>;
 	qcom,vdd-current-level = <200 800000>;
 
-	vdd-io-supply = <&pmcobalt_l13>;
+	vdd-io-supply = <&pm8998_l13>;
 	qcom,vdd-io-voltage-level = <1808000 2960000>;
 	qcom,vdd-io-current-level = <200 22000>;
 
@@ -85,8 +85,8 @@
 
 &soc {
 	sound_sim {
-		compatible = "qcom,msmcobalt-asoc-snd-stub";
-		qcom,model = "msmcobalt-stub-snd-card";
+		compatible = "qcom,msm8998-asoc-snd-stub";
+		qcom,model = "msm8998-stub-snd-card";
 
 		qcom,audio-routing =
 			"AIF4 VI", "MCLK",
@@ -111,7 +111,7 @@
 	interrupt-names = "cdc-int";
 };
 
-&pmicobalt_charger {
+&pmi8998_charger {
 	qcom,suspend-input;
 };
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-smp2p.dtsi b/arch/arm/boot/dts/qcom/msm8998-smp2p.dtsi
index 2926a6889395..2926a6889395 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-smp2p.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-smp2p.dtsi
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2-camera.dtsi b/arch/arm/boot/dts/qcom/msm8998-v2-camera.dtsi
index a81287c36266..a81287c36266 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2-camera.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-v2-camera.dtsi
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2-cdp.dts b/arch/arm/boot/dts/qcom/msm8998-v2-cdp.dts
index 7cb8f107abc4..0f5ad5366c84 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2-cdp.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2-cdp.dts
@@ -13,11 +13,11 @@
 
 /dts-v1/;
 
-#include "msmcobalt-v2.dtsi"
-#include "msmcobalt-cdp.dtsi"
+#include "msm8998-v2.dtsi"
+#include "msm8998-cdp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT v2 CDP";
-	compatible = "qcom,msmcobalt-cdp", "qcom,msmcobalt", "qcom,cdp";
+	model = "Qualcomm Technologies, Inc. MSM 8998 v2 CDP";
+	compatible = "qcom,msm8998-cdp", "qcom,msm8998", "qcom,cdp";
 	qcom,board-id = <1 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2-interposer-msmfalcon.dtsi b/arch/arm/boot/dts/qcom/msm8998-v2-interposer-msmfalcon.dtsi
index 46ed1f219970..d207628f06a1 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2-interposer-msmfalcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-v2-interposer-msmfalcon.dtsi
@@ -13,19 +13,19 @@
 /*
  * As a general rule, only version-specific property overrides should be placed
  * inside this file. Common device definitions should be placed inside the
- * msmcobalt.dtsi file.
+ * msm8998.dtsi file.
  */
 
-#include "msmcobalt-interposer-msmfalcon.dtsi"
-#include "msmcobalt-v2-camera.dtsi"
+#include "msm8998-interposer-msmfalcon.dtsi"
+#include "msm8998-v2-camera.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSMCOBALT v2";
+	model = "Qualcomm Technologies, Inc. MSM8998 v2";
 	qcom,msm-id = <292 0x20000>;
 };
 
 &clock_cpu {
-	compatible = "qcom,cpu-clock-osm-msmcobalt-v2";
+	compatible = "qcom,cpu-clock-osm-msm8998-v2";
 	/delete-property/ qcom,llm-sw-overr;
 	qcom,pwrcl-speedbin0-v0 =
 		<   300000000 0x0004000f 0x01200020 0x1 1 >,
@@ -187,19 +187,19 @@
 };
 
 &clock_gcc {
-	compatible = "qcom,gcc-cobalt-v2";
+	compatible = "qcom,gcc-8998-v2";
 };
 
 &clock_mmss {
-	compatible = "qcom,mmsscc-cobalt-v2";
+	compatible = "qcom,mmsscc-8998-v2";
 };
 
 &clock_gpu {
-	compatible = "qcom,gpucc-cobalt-v2";
+	compatible = "qcom,gpucc-8998-v2";
 };
 
 &clock_gfx {
-	compatible = "qcom,gfxcc-cobalt-v2";
+	compatible = "qcom,gfxcc-8998-v2";
 	qcom,gfxfreq-speedbin0 =
 		<         0 0                           0 >,
 		< 180000000 1 RPM_SMD_REGULATOR_LEVEL_SVS >,
@@ -227,18 +227,18 @@
 	qcom,max-bandwidth-per-pipe-kbps = <4700000>;
 };
 
-&pmcobalt_s10 {
+&pm8998_s10 {
 	regulator-min-microvolt = <568000>;
 	regulator-max-microvolt = <1056000>;
 };
 
-&pmcobalt_s13 {
+&pm8998_s13 {
 	regulator-min-microvolt = <568000>;
 	regulator-max-microvolt = <1056000>;
 };
 
 &apc0_cpr {
-	compatible = "qcom,cprh-msmcobalt-v2-kbss-regulator";
+	compatible = "qcom,cprh-msm8998-v2-kbss-regulator";
 	qcom,cpr-corner-switch-delay-time = <1042>;
 	qcom,cpr-aging-ref-voltage = <1056000>;
 };
@@ -389,7 +389,7 @@
 };
 
 &apc1_cpr {
-	compatible = "qcom,cprh-msmcobalt-v2-kbss-regulator";
+	compatible = "qcom,cprh-msm8998-v2-kbss-regulator";
 	qcom,cpr-corner-switch-delay-time = <1042>;
 	qcom,cpr-aging-ref-voltage = <1056000>;
 };
@@ -555,7 +555,7 @@
 };
 
 &gfx_cpr {
-	compatible = "qcom,cpr4-msmcobalt-v2-mmss-regulator";
+	compatible = "qcom,cpr4-msm8998-v2-mmss-regulator";
 	qcom,cpr-aging-ref-voltage = <1024000>;
 };
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2-mtp.dts b/arch/arm/boot/dts/qcom/msm8998-v2-mtp.dts
index 96e671f04df3..0708573934f3 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2-mtp.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2-mtp.dts
@@ -13,11 +13,11 @@
 
 /dts-v1/;
 
-#include "msmcobalt-v2.dtsi"
-#include "msmcobalt-mtp.dtsi"
+#include "msm8998-v2.dtsi"
+#include "msm8998-mtp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT v2 MTP";
-	compatible = "qcom,msmcobalt-mtp", "qcom,msmcobalt", "qcom,mtp";
+	model = "Qualcomm Technologies, Inc. MSM 8998 v2 MTP";
+	compatible = "qcom,msm8998-mtp", "qcom,msm8998", "qcom,mtp";
 	qcom,board-id = <8 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2-qrd-skuk.dts b/arch/arm/boot/dts/qcom/msm8998-v2-qrd-skuk.dts
index 581e9fef1aeb..471602ac80b9 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2-qrd-skuk.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2-qrd-skuk.dts
@@ -13,11 +13,11 @@
 
 /dts-v1/;
 
-#include "msmcobalt-v2.dtsi"
-#include "msmcobalt-qrd-skuk.dtsi"
+#include "msm8998-v2.dtsi"
+#include "msm8998-qrd-skuk.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT V2 SKUK";
-	compatible = "qcom,msmcobalt-qrd", "qcom,msmcobalt", "qcom,qrd";
+	model = "Qualcomm Technologies, Inc. MSM 8998 V2 SKUK";
+	compatible = "qcom,msm8998-qrd", "qcom,msm8998", "qcom,qrd";
 	qcom,board-id = <0x01000b 0x10>;
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2-qrd-vr1.dts b/arch/arm/boot/dts/qcom/msm8998-v2-qrd-vr1.dts
index 15dd2d550b31..58c7dc3bac11 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2-qrd-vr1.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2-qrd-vr1.dts
@@ -13,11 +13,11 @@
 
 /dts-v1/;
 
-#include "msmcobalt-v2.dtsi"
-#include "msmcobalt-qrd-vr1.dtsi"
+#include "msm8998-v2.dtsi"
+#include "msm8998-qrd-vr1.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT V2 VR1 Board";
-	compatible = "qcom,msmcobalt-qrd", "qcom,msmcobalt", "qcom,qrd";
+	model = "Qualcomm Technologies, Inc. MSM 8998 V2 VR1 Board";
+	compatible = "qcom,msm8998-qrd", "qcom,msm8998", "qcom,qrd";
 	qcom,board-id = <0x02000b 0x80>;
 };
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-v2.1-qrd.dts b/arch/arm/boot/dts/qcom/msm8998-v2-qrd.dts
index 8da6f90958d2..37ad18278e5c 100644
--- a/arch/arm/boot/dts/qcom/apqcobalt-v2.1-qrd.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2-qrd.dts
@@ -12,11 +12,11 @@
 
 /dts-v1/;
 
-#include "apqcobalt-v2.1.dtsi"
-#include "msmcobalt-qrd.dtsi"
+#include "msm8998-v2.dtsi"
+#include "msm8998-qrd.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ COBALT V2.1 QRD";
-	compatible = "qcom,apqcobalt-qrd", "qcom,apqcobalt", "qcom,qrd";
+	model = "Qualcomm Technologies, Inc. MSM 8998 v2 QRD";
+	compatible = "qcom,msm8998-qrd", "qcom,msm8998", "qcom,qrd";
 	qcom,board-id = <11 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2-rumi.dts b/arch/arm/boot/dts/qcom/msm8998-v2-rumi.dts
index cabfb135ca81..e6cf24e593ce 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2-rumi.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2-rumi.dts
@@ -14,12 +14,12 @@
 /dts-v1/;
 /memreserve/ 0x90000000 0x00000100;
 
-#include "msmcobalt-v2.dtsi"
-#include "msmcobalt-rumi.dtsi"
+#include "msm8998-v2.dtsi"
+#include "msm8998-rumi.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT V2 RUMI";
-	compatible = "qcom,msmcobalt-rumi", "qcom,msmcobalt", "qcom,rumi";
+	model = "Qualcomm Technologies, Inc. MSM 8998 V2 RUMI";
+	compatible = "qcom,msm8998-rumi", "qcom,msm8998", "qcom,rumi";
 	qcom,board-id = <15 0>;
 };
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2-sim.dts b/arch/arm/boot/dts/qcom/msm8998-v2-sim.dts
index 2789b27c9381..91c583df7ff3 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2-sim.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2-sim.dts
@@ -14,12 +14,12 @@
 /dts-v1/;
 /memreserve/ 0x90000000 0x00000100;
 
-#include "msmcobalt-v2.dtsi"
-#include "msmcobalt-sim.dtsi"
+#include "msm8998-v2.dtsi"
+#include "msm8998-sim.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT V2 SIM";
-	compatible = "qcom,msmcobalt-sim", "qcom,msmcobalt", "qcom,sim";
+	model = "Qualcomm Technologies, Inc. MSM 8998 V2 SIM";
+	compatible = "qcom,msm8998-sim", "qcom,msm8998", "qcom,sim";
 	qcom,board-id = <16 0>;
 };
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-cdp.dts b/arch/arm/boot/dts/qcom/msm8998-v2.1-cdp.dts
index d5afb1d3c151..871d13bdaa1a 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-cdp.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2.1-cdp.dts
@@ -13,11 +13,11 @@
 
 /dts-v1/;
 
-#include "msmcobalt-v2.1.dtsi"
-#include "msmcobalt-cdp.dtsi"
+#include "msm8998-v2.1.dtsi"
+#include "msm8998-cdp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT v2.1 CDP";
-	compatible = "qcom,msmcobalt-cdp", "qcom,msmcobalt", "qcom,cdp";
+	model = "Qualcomm Technologies, Inc. MSM 8998 v2.1 CDP";
+	compatible = "qcom,msm8998-cdp", "qcom,msm8998", "qcom,cdp";
 	qcom,board-id = <1 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-cdp.dts b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-cdp.dts
index 73bf279052e3..3a7767cf2f2e 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-cdp.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-cdp.dts
@@ -13,13 +13,13 @@
 
 /dts-v1/;
 
-#include "msmcobalt-v2.1-interposer-msmfalcon.dtsi"
-#include "msmcobalt-interposer-msmfalcon-cdp.dtsi"
-#include "msmcobalt-interposer-pmfalcon.dtsi"
+#include "msm8998-v2.1-interposer-msmfalcon.dtsi"
+#include "msm8998-interposer-msmfalcon-cdp.dtsi"
+#include "msm8998-interposer-pmfalcon.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT v2.1 MSM FALCON Interposer CDP";
-	compatible = "qcom,msmcobalt-cdp", "qcom,msmcobalt", "qcom,cdp";
+	model = "Qualcomm Technologies, Inc. MSM 8998 v2.1 MSM FALCON Interposer CDP";
+	compatible = "qcom,msm8998-cdp", "qcom,msm8998", "qcom,cdp";
 	qcom,board-id = <1 1>;
 };
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-mtp.dts b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-mtp.dts
index 7807a13489d1..662086f0190f 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-mtp.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-mtp.dts
@@ -13,13 +13,13 @@
 
 /dts-v1/;
 
-#include "msmcobalt-v2.1-interposer-msmfalcon.dtsi"
-#include "msmcobalt-interposer-msmfalcon-mtp.dtsi"
-#include "msmcobalt-interposer-pmfalcon.dtsi"
+#include "msm8998-v2.1-interposer-msmfalcon.dtsi"
+#include "msm8998-interposer-msmfalcon-mtp.dtsi"
+#include "msm8998-interposer-pmfalcon.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT v2.1 MSM FALCON Interposer MTP";
-	compatible = "qcom,msmcobalt-mtp", "qcom,msmcobalt", "qcom,mtp";
+	model = "Qualcomm Technologies, Inc. MSM 8998 v2.1 MSM FALCON Interposer MTP";
+	compatible = "qcom,msm8998-mtp", "qcom,msm8998", "qcom,mtp";
 	qcom,board-id = <8 2>;
 };
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-qrd.dts b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-qrd.dts
index e5ad123f52a7..ddae02812731 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-qrd.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-qrd.dts
@@ -13,12 +13,12 @@
 
 /dts-v1/;
 
-#include "msmcobalt-v2.1-interposer-msmfalcon-qrd.dtsi"
+#include "msm8998-v2.1-interposer-msmfalcon-qrd.dtsi"
 
 / {
 	model =
-	"Qualcomm Technologies, Inc. MSM COBALT v2.1 MSM FALCON Interposer QRD";
-	compatible = "qcom,msmcobalt-qrd", "qcom,msmcobalt", "qcom,qrd";
+	"Qualcomm Technologies, Inc. MSM 8998 v2.1 MSM FALCON Interposer QRD";
+	compatible = "qcom,msm8998-qrd", "qcom,msm8998", "qcom,qrd";
 	qcom,board-id = <0x03000b 0x80>;
 };
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-qrd.dtsi b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-qrd.dtsi
index b257281466a9..cd0e20a295d9 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon-qrd.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-qrd.dtsi
@@ -11,7 +11,7 @@
  */
 
 #include <dt-bindings/interrupt-controller/irq.h>
-#include "msmcobalt-v2.1-interposer-msmfalcon.dtsi"
+#include "msm8998-v2.1-interposer-msmfalcon.dtsi"
 
 &uartblsp2dm1 {
 	status = "ok";
@@ -20,6 +20,9 @@
 };
 
 &ufsphy1 {
+	vdda-phy-supply = <&pm2falcon_l1>;
+	vdda-pll-supply = <&pmfalcon_l10>;
+	vddp-ref-clk-supply = <&pmfalcon_l8>;
 	vdda-phy-max-microamp = <51400>;
 	vdda-pll-max-microamp = <14600>;
 	vddp-ref-clk-max-microamp = <100>;
@@ -30,6 +33,9 @@
 &ufs1 {
 	vdd-hba-supply = <&gdsc_ufs>;
 	vdd-hba-fixed-regulator;
+	vcc-supply = <&pm2falcon_l4>;
+	vccq-supply = <&pmfalcon_l8>;
+	vccq2-supply = <&pmfalcon_l8>;
 	vcc-max-microamp = <750000>;
 	vccq-max-microamp = <560000>;
 	vccq2-max-microamp = <750000>;
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon.dtsi b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon.dtsi
index 96ff7f70788f..c2a393bd019d 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-interposer-msmfalcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon.dtsi
@@ -10,9 +10,9 @@
  * GNU General Public License for more details.
  */
 
-#include "msmcobalt-v2-interposer-msmfalcon.dtsi"
+#include "msm8998-v2-interposer-msmfalcon.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSMCOBALT v2.1";
+	model = "Qualcomm Technologies, Inc. MSM8998 v2.1";
 	qcom,msm-id = <292 0x20001>;
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-mtp.dts b/arch/arm/boot/dts/qcom/msm8998-v2.1-mtp.dts
index f49b43420a06..9d7cbc93d9df 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-mtp.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2.1-mtp.dts
@@ -13,11 +13,11 @@
 
 /dts-v1/;
 
-#include "msmcobalt-v2.1.dtsi"
-#include "msmcobalt-mtp.dtsi"
+#include "msm8998-v2.1.dtsi"
+#include "msm8998-mtp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT v2.1 MTP";
-	compatible = "qcom,msmcobalt-mtp", "qcom,msmcobalt", "qcom,mtp";
+	model = "Qualcomm Technologies, Inc. MSM 8998 v2.1 MTP";
+	compatible = "qcom,msm8998-mtp", "qcom,msm8998", "qcom,mtp";
 	qcom,board-id = <8 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-qrd.dts b/arch/arm/boot/dts/qcom/msm8998-v2.1-qrd.dts
index 7a3b6f50932b..b20c888ad933 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-qrd.dts
+++ b/arch/arm/boot/dts/qcom/msm8998-v2.1-qrd.dts
@@ -13,11 +13,11 @@
 
 /dts-v1/;
 
-#include "msmcobalt-v2.1.dtsi"
-#include "msmcobalt-qrd.dtsi"
+#include "msm8998-v2.1.dtsi"
+#include "msm8998-qrd.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT v2.1 QRD";
-	compatible = "qcom,msmcobalt-qrd", "qcom,msmcobalt", "qcom,qrd";
+	model = "Qualcomm Technologies, Inc. MSM 8998 v2.1 QRD";
+	compatible = "qcom,msm8998-qrd", "qcom,msm8998", "qcom,qrd";
 	qcom,board-id = <11 0>;
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1.dtsi b/arch/arm/boot/dts/qcom/msm8998-v2.1.dtsi
index 3f5c42ae8cc8..563157df40a8 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.1.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-v2.1.dtsi
@@ -10,9 +10,9 @@
  * GNU General Public License for more details.
  */
 
-#include "msmcobalt-v2.dtsi"
+#include "msm8998-v2.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSMCOBALT v2.1";
+	model = "Qualcomm Technologies, Inc. MSM8998 v2.1";
 	qcom,msm-id = <292 0x20001>;
 };
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi b/arch/arm/boot/dts/qcom/msm8998-v2.dtsi
index 93b586df5640..dc1922851a77 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-v2.dtsi
@@ -13,38 +13,19 @@
 /*
  * As a general rule, only version-specific property overrides should be placed
  * inside this file. Common device definitions should be placed inside the
- * msmcobalt.dtsi file.
+ * msm8998.dtsi file.
  */
 
-#include "msmcobalt.dtsi"
-#include "msmcobalt-v2-camera.dtsi"
+#include "msm8998.dtsi"
+#include "msm8998-v2-camera.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. MSMCOBALT v2";
+	model = "Qualcomm Technologies, Inc. MSM8998 v2";
 	qcom,msm-id = <292 0x20000>;
 };
 
 &clock_cpu {
-	compatible = "qcom,cpu-clock-osm-msmcobalt-v2";
-	reg = <0x179c0000 0x4000>,
-	      <0x17916000 0x1000>,
-	      <0x17816000 0x1000>,
-	      <0x179d1000 0x1000>,
-	      <0x17914800 0x800>,
-	      <0x17814800 0x800>,
-	      <0x00784130 0x8>,
-	      <0x1791101c 0x8>;
-	reg-names = "osm", "pwrcl_pll", "perfcl_pll",
-		    "apcs_common", "pwrcl_acd", "perfcl_acd",
-		    "perfcl_efuse", "debug";
-
-	qcom,acdtd-val = <0x00009611 0x00009611>;
-	qcom,acdcr-val = <0x002b5ffd 0x002b5ffd>;
-	qcom,acdsscr-val = <0x00000501 0x00000501>;
-	qcom,acdextint0-val = <0x2cf9ae8 0x2cf9ae8>;
-	qcom,acdextint1-val = <0x2cf9afc 0x2cf9afc>;
-	qcom,acdautoxfer-val = <0x00000015 0x00000015>;
-
+	compatible = "qcom,cpu-clock-osm-msm8998-v2";
 	/delete-property/ qcom,llm-sw-overr;
 	qcom,pwrcl-speedbin0-v0 =
 		<   300000000 0x0004000f 0x01200020 0x1 1 >,
@@ -224,19 +205,19 @@
 		< 2208000 13763 >;
 };
 &clock_gcc {
-	compatible = "qcom,gcc-cobalt-v2";
+	compatible = "qcom,gcc-8998-v2";
 };
 
 &clock_mmss {
-	compatible = "qcom,mmsscc-cobalt-v2";
+	compatible = "qcom,mmsscc-8998-v2";
 };
 
 &clock_gpu {
-	compatible = "qcom,gpucc-cobalt-v2";
+	compatible = "qcom,gpucc-8998-v2";
 };
 
 &clock_gfx {
-	compatible = "qcom,gfxcc-cobalt-v2";
+	compatible = "qcom,gfxcc-8998-v2";
 	qcom,gfxfreq-speedbin0 =
 		<         0 0                           0 >,
 		< 180000000 1 RPM_SMD_REGULATOR_LEVEL_SVS >,
@@ -266,12 +247,12 @@
 	qcom,max-bandwidth-per-pipe-kbps = <4700000>;
 };
 
-&pmcobalt_s10 {
+&pm8998_s10 {
 	regulator-min-microvolt = <568000>;
 	regulator-max-microvolt = <1056000>;
 };
 
-&pmcobalt_s13 {
+&pm8998_s13 {
 	regulator-min-microvolt = <568000>;
 	regulator-max-microvolt = <1056000>;
 };
@@ -355,7 +336,7 @@
 };
 
 &apc0_cpr {
-	compatible = "qcom,cprh-msmcobalt-v2-kbss-regulator";
+	compatible = "qcom,cprh-msm8998-v2-kbss-regulator";
 	qcom,cpr-corner-switch-delay-time = <1042>;
 	qcom,cpr-aging-ref-voltage = <1056000>;
 };
@@ -508,7 +489,7 @@
 };
 
 &apc1_cpr {
-	compatible = "qcom,cprh-msmcobalt-v2-kbss-regulator";
+	compatible = "qcom,cprh-msm8998-v2-kbss-regulator";
 	qcom,cpr-corner-switch-delay-time = <1042>;
 	qcom,cpr-aging-ref-voltage = <1056000>;
 };
@@ -676,7 +657,7 @@
 };
 
 &gfx_cpr {
-	compatible = "qcom,cpr4-msmcobalt-v2-mmss-regulator";
+	compatible = "qcom,cpr4-msm8998-v2-mmss-regulator";
 	qcom,cpr-aging-ref-voltage = <1024000>;
 };
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-vidc.dtsi b/arch/arm/boot/dts/qcom/msm8998-vidc.dtsi
index a8655c2e88a0..b8a0b8f3acf2 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-vidc.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-vidc.dtsi
@@ -12,7 +12,7 @@
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/msm/msm-bus-ids.h>
-#include <dt-bindings/clock/msm-clocks-cobalt.h>
+#include <dt-bindings/clock/msm-clocks-8998.h>
 
 &soc {
 	msm_vidc: qcom,vidc@cc00000 {
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-wcd.dtsi b/arch/arm/boot/dts/qcom/msm8998-wcd.dtsi
index 29f4ccaede9f..29f4ccaede9f 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-wcd.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-wcd.dtsi
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-wsa881x.dtsi b/arch/arm/boot/dts/qcom/msm8998-wsa881x.dtsi
index baf05c1c241b..746cf23b4c97 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-wsa881x.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-wsa881x.dtsi
@@ -9,7 +9,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include "msmcobalt-wcd.dtsi"
+#include "msm8998-wcd.dtsi"
 
 &slim_aud {
 	tasha_codec {
diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msm8998.dtsi
index cee85ff63ca8..7f7f2f65deee 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998.dtsi
@@ -11,13 +11,13 @@
  */
 
 #include "skeleton64.dtsi"
-#include <dt-bindings/clock/msm-clocks-cobalt.h>
+#include <dt-bindings/clock/msm-clocks-8998.h>
 #include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
-	model = "Qualcomm Technologies, Inc. MSM COBALT";
-	compatible = "qcom,msmcobalt";
+	model = "Qualcomm Technologies, Inc. MSM 8998";
+	compatible = "qcom,msm8998";
 	qcom,msm-id = <292 0x0>;
 	interrupt-parent = <&intc>;
 
@@ -341,8 +341,8 @@
 	};
 };
 
-#include "msmcobalt-smp2p.dtsi"
-#include "msm-gdsc-cobalt.dtsi"
+#include "msm8998-smp2p.dtsi"
+#include "msm-gdsc-8998.dtsi"
 
 &soc {
 	#address-cells = <1>;
@@ -731,21 +731,21 @@
 	};
 
 	clock_gcc: qcom,gcc@100000 {
-		compatible = "qcom,gcc-cobalt";
+		compatible = "qcom,gcc-8998";
 		reg = <0x100000 0xb0000>;
 		reg-names = "cc_base";
-		vdd_dig-supply = <&pmcobalt_s1_level>;
-		vdd_dig_ao-supply = <&pmcobalt_s1_level_ao>;
+		vdd_dig-supply = <&pm8998_s1_level>;
+		vdd_dig_ao-supply = <&pm8998_s1_level_ao>;
 		#clock-cells = <1>;
 		#reset-cells = <1>;
 	};
 
 	clock_mmss: qcom,mmsscc@c8c0000 {
-		compatible = "qcom,mmsscc-cobalt";
+		compatible = "qcom,mmsscc-8998";
 		reg = <0xc8c0000 0x40000>;
 		reg-names = "cc_base";
-		vdd_dig-supply = <&pmcobalt_s1_level>;
-		vdd_mmsscc_mx-supply = <&pmcobalt_s9_level>;
+		vdd_dig-supply = <&pm8998_s1_level>;
+		vdd_mmsscc_mx-supply = <&pm8998_s9_level>;
 		clock-names = "xo", "gpll0", "gpll0_div",
 				"pclk0_src", "pclk1_src",
 				"byte0_src", "byte1_src",
@@ -766,10 +766,10 @@
 	};
 
 	clock_gpu: qcom,gpucc@5065000 {
-		compatible = "qcom,gpucc-cobalt";
+		compatible = "qcom,gpucc-8998";
 		reg = <0x5065000 0x9000>;
 		reg-names = "cc_base";
-		vdd_dig-supply = <&pmcobalt_s1_level>;
+		vdd_dig-supply = <&pm8998_s1_level>;
 		clock-names = "xo_ao", "gpll0";
 		clocks = <&clock_gcc clk_cxo_clk_src_ao>,
 			<&clock_gcc clk_gcc_gpu_gpll0_clk>;
@@ -777,12 +777,12 @@
 	};
 
 	clock_gfx: qcom,gfxcc@5065000 {
-		compatible = "qcom,gfxcc-cobalt";
+		compatible = "qcom,gfxcc-8998";
 		reg = <0x5065000 0x9000>;
 		reg-names = "cc_base";
 		vdd_gpucc-supply = <&gfx_vreg>;
-		vdd_mx-supply = <&pmcobalt_s9_level>;
-		vdd_gpu_mx-supply = <&pmcobalt_s9_level>;
+		vdd_mx-supply = <&pm8998_s9_level>;
+		vdd_gpu_mx-supply = <&pm8998_s9_level>;
 		qcom,gfx3d_clk_src-opp-handle = <&msm_gpu>;
 		qcom,gfxfreq-speedbin0 =
 			<	  0 0				0 >,
@@ -803,8 +803,8 @@
 		#clock-cells = <1>;
 	};
 
-	clock_cpu: qcom,cpu-clock-cobalt@179c0000 {
-		compatible = "qcom,cpu-clock-osm-msmcobalt-v1";
+	clock_cpu: qcom,cpu-clock-8998@179c0000 {
+		compatible = "qcom,cpu-clock-osm-msm8998-v1";
 		reg = <0x179c0000 0x4000>,
 		      <0x17916000 0x1000>,
 		      <0x17816000 0x1000>,
@@ -941,7 +941,7 @@
 	};
 
 	clock_debug: qcom,debugcc@162000 {
-		compatible = "qcom,cc-debug-cobalt";
+		compatible = "qcom,cc-debug-8998";
 		reg = <0x162000 0x4>;
 		reg-names = "cc_base";
 		clock-names = "debug_gpu_clk", "debug_gfx_clk",
@@ -1688,7 +1688,7 @@
 					<61 512 240000 800000>;
 
 		qcom,dwc-usb3-msm-tx-fifo-size = <21288>;
-		extcon = <&pmicobalt_pdphy>;
+		extcon = <&pmi8998_pdphy>;
 
 		clocks = <&clock_gcc clk_gcc_usb30_master_clk>,
 			<&clock_gcc clk_gcc_cfg_noc_usb3_axi_clk>,
@@ -1757,9 +1757,9 @@
 		      <0x01fcb24c 0x4>;
 		reg-names = "qusb_phy_base",
 				"tcsr_clamp_dig_n_1p8";
-		vdd-supply = <&pmcobalt_l1>;
-		vdda18-supply = <&pmcobalt_l12>;
-		vdda33-supply = <&pmcobalt_l24>;
+		vdd-supply = <&pm8998_l1>;
+		vdda18-supply = <&pm8998_l12>;
+		vdda33-supply = <&pm8998_l24>;
 		qcom,vdd-voltage-level = <0 880000 880000>;
 		qcom,qusb-phy-init-seq =
 				/* <value reg_offset> */
@@ -1787,8 +1787,8 @@
 		reg-names = "qmp_phy_base",
 			    "vls_clamp_reg",
 			    "tcsr_usb3_dp_phymode";
-		vdd-supply = <&pmcobalt_l1>;
-		core-supply = <&pmcobalt_l2>;
+		vdd-supply = <&pm8998_l1>;
+		core-supply = <&pm8998_l2>;
 		qcom,vdd-voltage-level = <0 880000 880000>;
 		qcom,vbus-valid-override;
 		qcom,qmp-phy-init-seq =
@@ -1957,7 +1957,7 @@
 		reg = <0x17300000 0x00100>;
 		interrupts = <0 162 1>;
 
-		vdd_cx-supply = <&pmcobalt_s1_level>;
+		vdd_cx-supply = <&pm8998_s1_level>;
 		qcom,proxy-reg-names = "vdd_cx";
 		qcom,vdd_cx-uV-uA = <RPM_SMD_REGULATOR_LEVEL_TURBO 100000>;
 
@@ -2038,9 +2038,9 @@
 					  "mnoc_axi_clk";
 
 		interrupts = <0 448 1>;
-		vdd_cx-supply = <&pmcobalt_s1_level>;
+		vdd_cx-supply = <&pm8998_s1_level>;
 		vdd_cx-voltage = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-		vdd_mx-supply = <&pmcobalt_s9_level>;
+		vdd_mx-supply = <&pm8998_s9_level>;
 		vdd_mx-uV = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 		qcom,firmware-name = "modem";
 		qcom,pil-self-auth;
@@ -2064,7 +2064,7 @@
 	};
 
 	tsens0: tsens@10aa000 {
-		compatible = "qcom,msmcobalt-tsens";
+		compatible = "qcom,msm8998-tsens";
 		reg = <0x10aa000 0x2000>;
 		reg-names = "tsens_physical";
 		interrupts = <0 458 0>, <0 445 0>;
@@ -2075,7 +2075,7 @@
 	};
 
 	tsens1: tsens@10ad000 {
-		compatible = "qcom,msmcobalt-tsens";
+		compatible = "qcom,msm8998-tsens";
 		reg = <0x10ad000 0x2000>;
 		reg-names = "tsens_physical";
 		interrupts = <0 184 0>, <0 430 0>;
@@ -2092,7 +2092,7 @@
 			<&clock_gcc clk_gcc_blsp2_ahb_clk>;
 		clock-frequency = <15000000>;
 		qcom,ipc-gpio = <&tlmm 121 0>;
-		qcom,finger-detect-gpio = <&pmcobalt_gpios 2 0>;
+		qcom,finger-detect-gpio = <&pm8998_gpios 2 0>;
 	};
 
 	qcom,sensor-information {
@@ -2410,7 +2410,7 @@
 		qcom,vdd-restriction-temp = <5>;
 		qcom,vdd-restriction-temp-hysteresis = <10>;
 
-		vdd-dig-supply = <&pmcobalt_s1_floor_level>;
+		vdd-dig-supply = <&pm8998_s1_floor_level>;
 		vdd-gfx-supply = <&gfx_vreg>;
 
 		qcom,vdd-dig-rstr{
@@ -2596,9 +2596,9 @@
 		wake-gpio = <&tlmm 37 0>;
 
 		gdsc-vdd-supply = <&gdsc_pcie_0>;
-		vreg-1.8-supply = <&pmcobalt_l2>;
-		vreg-0.9-supply = <&pmcobalt_l1>;
-		vreg-cx-supply = <&pmcobalt_s1_level>;
+		vreg-1.8-supply = <&pm8998_l2>;
+		vreg-0.9-supply = <&pm8998_l1>;
+		vreg-cx-supply = <&pm8998_s1_level>;
 
 		qcom,vreg-1.8-voltage-level = <1200000 1200000 24000>;
 		qcom,vreg-0.9-voltage-level = <880000 880000 24000>;
@@ -2682,8 +2682,8 @@
 		reg = <0x5c00000 0x4000>;
 		interrupts = <0 390 1>;
 
-		vdd_cx-supply = <&pmcobalt_l27_level>;
-		vdd_px-supply = <&pmcobalt_lvs2>;
+		vdd_cx-supply = <&pm8998_l27_level>;
+		vdd_px-supply = <&pm8998_lvs2>;
 		qcom,vdd_cx-uV-uA = <RPM_SMD_REGULATOR_LEVEL_TURBO 0>;
 		qcom,proxy-reg-names = "vdd_cx", "vdd_px";
 		qcom,keep-proxy-regs-on;
@@ -2766,7 +2766,7 @@
 			    "sp2soc_irq_mask", "rmb_err", "rmb_err_spare2";
 		interrupts = <0 352 1>;
 
-		vdd_cx-supply = <&pmcobalt_s1_level>;
+		vdd_cx-supply = <&pm8998_s1_level>;
 		qcom,proxy-reg-names = "vdd_cx";
 		qcom,vdd_cx-uV-uA = <RPM_SMD_REGULATOR_LEVEL_TURBO 100000>;
 
@@ -2988,14 +2988,19 @@
 			     <0 424 0 /* CE10 */ >,
 			     <0 425 0 /* CE11 */ >;
 		qcom,wlan-msa-memory = <0x100000>;
-		vdd-0.8-cx-mx-supply = <&pmcobalt_l5>;
-		vdd-1.8-xo-supply = <&pmcobalt_l7_pin_ctrl>;
-		vdd-1.3-rfa-supply = <&pmcobalt_l17_pin_ctrl>;
-		vdd-3.3-ch0-supply = <&pmcobalt_l25_pin_ctrl>;
+		vdd-0.8-cx-mx-supply = <&pm8998_l5>;
+		vdd-1.8-xo-supply = <&pm8998_l7_pin_ctrl>;
+		vdd-1.3-rfa-supply = <&pm8998_l17_pin_ctrl>;
+		vdd-3.3-ch0-supply = <&pm8998_l25_pin_ctrl>;
 		qcom,vdd-0.8-cx-mx-config = <800000 800000>;
 		qcom,vdd-3.3-ch0-config = <3104000 3312000>;
-		qcom,icnss-vadc = <&pmcobalt_vadc>;
-		qcom,icnss-adc_tm = <&pmcobalt_adc_tm>;
+		qcom,msm-bus,name = "msm-icnss";
+		qcom,msm-bus,num-cases = <2>;
+		qcom,msm-bus,num-paths = <1>;
+		qcom,msm-bus,vectors-KBps = <81 10065 0 0>,
+					    <81 10065 0 16000>;
+		qcom,icnss-vadc = <&pm8998_vadc>;
+		qcom,icnss-adc_tm = <&pm8998_adc_tm>;
 	};
 
 	tspp: msm_tspp@0c1e7000 {
@@ -3060,8 +3065,8 @@
 			<45 512 0 0>,
 			<45 512 600000 800000>; /* ~4.6Gbps (MCS12) */
 		qcom,use-ext-supply;
-		vdd-supply= <&pmcobalt_s7>;
-		vddio-supply= <&pmcobalt_s5>;
+		vdd-supply= <&pm8998_s7>;
+		vddio-supply= <&pm8998_s5>;
 		qcom,use-ext-clocks;
 		clocks = <&clock_gcc clk_rf_clk3>,
 			 <&clock_gcc clk_rf_clk3_pin>;
@@ -3174,25 +3179,25 @@
 	status = "ok";
 };
 
-#include "msm-pmcobalt.dtsi"
-#include "msm-pmicobalt.dtsi"
+#include "msm-pm8998.dtsi"
+#include "msm-pmi8998.dtsi"
 #include "msm-pm8005.dtsi"
-#include "msm-pmcobalt-rpm-regulator.dtsi"
-#include "msmcobalt-regulator.dtsi"
-
-#include "msmcobalt-pm.dtsi"
-#include "msm-arm-smmu-cobalt.dtsi"
-#include "msm-arm-smmu-impl-defs-cobalt.dtsi"
-#include "msmcobalt-ion.dtsi"
-#include "msmcobalt-camera.dtsi"
-#include "msmcobalt-vidc.dtsi"
-#include "msmcobalt-coresight.dtsi"
-#include "msmcobalt-bus.dtsi"
-#include "msmcobalt-gpu.dtsi"
-#include "msmcobalt-pinctrl.dtsi"
+#include "msm-pm8998-rpm-regulator.dtsi"
+#include "msm8998-regulator.dtsi"
+
+#include "msm8998-pm.dtsi"
+#include "msm-arm-smmu-8998.dtsi"
+#include "msm-arm-smmu-impl-defs-8998.dtsi"
+#include "msm8998-ion.dtsi"
+#include "msm8998-camera.dtsi"
+#include "msm8998-vidc.dtsi"
+#include "msm8998-coresight.dtsi"
+#include "msm8998-bus.dtsi"
+#include "msm8998-gpu.dtsi"
+#include "msm8998-pinctrl.dtsi"
 #include "msm-audio-lpass.dtsi"
-#include "msmcobalt-mdss.dtsi"
-#include "msmcobalt-mdss-pll.dtsi"
+#include "msm8998-mdss.dtsi"
+#include "msm8998-mdss-pll.dtsi"
 #include "msm-rdbg.dtsi"
-#include "msmcobalt-blsp.dtsi"
-#include "msmcobalt-audio.dtsi"
+#include "msm8998-blsp.dtsi"
+#include "msm8998-audio.dtsi"
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-rumi.dts b/arch/arm/boot/dts/qcom/msmfalcon-rumi.dts
index 1575cea079ce..00efa39f017d 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon-rumi.dts
+++ b/arch/arm/boot/dts/qcom/msmfalcon-rumi.dts
@@ -102,3 +102,8 @@
 &pmfalcon_fg {
 	status = "disabled";
 };
+
+&clock_gfx {
+	compatible = "qcom,dummycc";
+	clock-output-names = "gfx_clocks";
+};
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-vidc.dtsi b/arch/arm/boot/dts/qcom/msmfalcon-vidc.dtsi
new file mode 100644
index 000000000000..73d1cac48f9e
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msmfalcon-vidc.dtsi
@@ -0,0 +1,268 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/msm/msm-bus-ids.h>
+#include <dt-bindings/clock/qcom,gcc-msmfalcon.h>
+#include <dt-bindings/clock/qcom,mmcc-msmfalcon.h>
+
+&soc {
+	msm_vidc: qcom,vidc@cc00000 {
+		compatible = "qcom,msm-vidc";
+		status = "ok";
+		reg = <0xcc00000 0x100000>;
+		interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+		qcom,hfi = "venus";
+		qcom,hfi-version = "3xx";
+		qcom,firmware-name = "venus";
+		qcom,sw-power-collapse;
+		qcom,debug-timeout;
+		qcom,reg-presets =
+			<0x80124 0x00000003>,
+			<0x80550 0x01111111>,
+			<0x80560 0x01111111>,
+			<0x80568 0x01111111>,
+			<0x80570 0x01111111>,
+			<0x80580 0x01111111>,
+			<0x80588 0x01111111>,
+			<0xe2010 0x00000000>;
+
+		qcom,max-hw-load = <1036800>; /* Full 4k @ 30 */
+		qcom,allowed-clock-rates =
+			/* TURBO     NOM+      NOM
+			 *  SVS+      SVS       SVS-
+			 */
+			<518400000 441600000 404000000
+			320000000 269330000 133330000>;
+
+		qcom,dcvs-tbl =
+			/* Dec UHD@30 All decoder - NOM to SVS+ */
+			<897600 734400 979200 0x3f00000c>,
+
+			/* Dec DCI@24 HEVC - NOM to SVS+ */
+			<816000 734400 829440 0x0c000000>,
+
+			/* Enc UHD@30 H264/HEVC - TURBO to NOM+ */
+			<897600 897600 979200 0x4000004>;
+		qcom,dcvs-limit =
+			<32400 30>, /* Encoder UHD */
+			<32400 24>; /* Decoder UHD */
+
+		/* Regulators */
+		smmu-vdd-supply = <&gdsc_bimc_smmu>;
+		venus-supply = <&gdsc_venus>;
+		venus-core0-supply = <&gdsc_venus_core0>;
+
+		/* Clocks */
+		clock-names = "gcc_mmss_sys_noc_axi_clk",
+			"mmssnoc_axi_clk", "mmss_mnoc_ahb_clk",
+			"mmss_bimc_smmu_ahb_clk", "mmss_bimc_smmu_axi_clk",
+			"mmss_video_core_clk", "mmss_video_ahb_clk",
+			"mmss_video_axi_clk",
+			"mmss_video_core0_clk";
+		clocks = <&clock_gcc GCC_MMSS_SYS_NOC_AXI_CLK>,
+			<&clock_gcc MMSSNOC_AXI_CLK>,
+			<&clock_mmss MMSS_MNOC_AHB_CLK>,
+			<&clock_mmss MMSS_BIMC_SMMU_AHB_CLK>,
+			<&clock_mmss MMSS_BIMC_SMMU_AXI_CLK>,
+			<&clock_mmss MMSS_VIDEO_CORE_CLK>,
+			<&clock_mmss MMSS_VIDEO_AHB_CLK>,
+			<&clock_mmss  MMSS_VIDEO_AXI_CLK>,
+			<&clock_mmss MMSS_VIDEO_SUBCORE0_CLK>;
+		qcom,clock-configs = <0x0 0x0 0x0 0x0 0x0
+				0x3 0x0 0x2 0x3>;
+
+		/* Buses */
+		bus_cnoc {
+			compatible = "qcom,msm-vidc,bus";
+			label = "cnoc";
+			qcom,bus-master = <MSM_BUS_MASTER_AMPSS_M0>;
+			qcom,bus-slave = <MSM_BUS_SLAVE_VENUS_CFG>;
+			qcom,bus-governor = "performance";
+			qcom,bus-range-kbps = <1 1>;
+		};
+
+		venus_bus_ddr {
+			compatible = "qcom,msm-vidc,bus";
+			label = "venus-ddr";
+			qcom,bus-master = <MSM_BUS_MASTER_VIDEO_P0>;
+			qcom,bus-slave = <MSM_BUS_SLAVE_EBI_CH0>;
+			qcom,bus-governor = "venus-ddr-gov";
+			qcom,bus-range-kbps = <1000 2365000>;
+		};
+
+		arm9_bus_ddr {
+			compatible = "qcom,msm-vidc,bus";
+			label = "venus-arm9-ddr";
+			qcom,bus-master = <MSM_BUS_MASTER_VIDEO_P0>;
+			qcom,bus-slave = <MSM_BUS_SLAVE_EBI_CH0>;
+			qcom,bus-governor = "performance";
+			qcom,bus-range-kbps = <1 1>;
+		};
+
+		qcom,clock-freq-tbl {
+			qcom,profile-enc {
+				qcom,codec-mask = <0x55555555>;
+				qcom,cycles-per-mb = <863>;
+				qcom,low-power-mode-factor = <35616>;
+			};
+			qcom,profile-dec {
+				qcom,codec-mask = <0xf3ffffff>;
+				qcom,cycles-per-mb = <355>;
+			};
+			qcom,profile-hevcdec {
+				qcom,codec-mask = <0x0c000000>;
+				qcom,cycles-per-mb = <400>;
+			};
+	    };
+
+	    venus-ddr-gov {
+		compatible = "qcom,msm-vidc,governor,table";
+		name = "venus-ddr-gov";
+		status = "ok";
+		qcom,bus-freq-table {
+			qcom,profile-enc {
+				qcom,codec-mask = <0x55555555>;
+				qcom,load-busfreq-tbl =
+					<979200 1044000>,  /* UHD30E     */
+					<864000 887000>,   /* 720p240LPE */
+					<489600 666000>,   /* 1080p60E   */
+					<432000 578000>,   /* 720p120E   */
+					<244800 346000>,   /* 1080p30E   */
+					<216000 293000>,   /* 720p60E    */
+					<108000 151000>,   /* 720p30E    */
+					<0 0>;
+			};
+			qcom,profile-dec {
+				qcom,codec-mask = <0xffffffff>;
+				qcom,load-busfreq-tbl =
+					<979200 2365000>,  /* UHD30D     */
+					<864000 1978000>,  /* 720p240D   */
+					<489600 1133000>,  /* 1080p60D   */
+					<432000 994000>,   /* 720p120D   */
+					<244800 580000>,   /* 1080p30D   */
+					<216000 501000>,   /* 720p60E    */
+					<108000 255000>,   /* 720p30D    */
+					<0 0>;
+			};
+			qcom,profile-dec-ubwc {
+				qcom,codec-mask = <0xffffffff>;
+				qcom,ubwc-mode;
+				qcom,load-busfreq-tbl =
+					<979200 1892000>,  /* UHD30D     */
+					<864000 1554000>,  /* 720p240D   */
+					<489600 895000>,   /* 1080p60D   */
+					<432000 781000>,   /* 720p120D   */
+					<244800 460000>,   /* 1080p30D   */
+					<216000 301000>,   /* 720p60E    */
+					<108000 202000>,   /* 720p30D    */
+					<0 0>;
+			};
+			qcom,profile-dec-ubwc-10bit {
+				qcom,codec-mask = <0xffffffff>;
+				qcom,ubwc-10bit;
+				qcom,load-busfreq-tbl =
+					<979200 2446336>,  /* UHD30D     */
+					<864000 2108416>,  /* 720p240D   */
+					<489600 1207296>,  /* 1080p60D   */
+					<432000 1058816>,  /* 720p120D   */
+					<244800 616448>,   /* 1080p30D   */
+					<216000 534528>,   /* 720p60D    */
+					<108000 271360>,   /* 720p30D    */
+					<0 0>;
+			};
+		};
+	};
+
+
+		/* MMUs */
+		non_secure_cb {
+			compatible = "qcom,msm-vidc,context-bank";
+			label = "venus_ns";
+			iommus =
+				<&mmss_bimc_smmu 0x400>,
+				<&mmss_bimc_smmu 0x401>,
+				<&mmss_bimc_smmu 0x40a>,
+				<&mmss_bimc_smmu 0x407>,
+				<&mmss_bimc_smmu 0x40e>,
+				<&mmss_bimc_smmu 0x40f>,
+				<&mmss_bimc_smmu 0x408>,
+				<&mmss_bimc_smmu 0x409>,
+				<&mmss_bimc_smmu 0x40b>,
+				<&mmss_bimc_smmu 0x40c>,
+				<&mmss_bimc_smmu 0x40d>,
+				<&mmss_bimc_smmu 0x410>,
+				<&mmss_bimc_smmu 0x421>,
+				<&mmss_bimc_smmu 0x428>,
+				<&mmss_bimc_smmu 0x429>,
+				<&mmss_bimc_smmu 0x42b>,
+				<&mmss_bimc_smmu 0x42c>,
+				<&mmss_bimc_smmu 0x42d>,
+				<&mmss_bimc_smmu 0x411>,
+				<&mmss_bimc_smmu 0x431>;
+			buffer-types = <0xfff>;
+			virtual-addr-pool = <0x70800000 0x8f800000>;
+		};
+
+		firmware_cb {
+			compatible = "qcom,msm-vidc,context-bank";
+			qcom,fw-context-bank;
+			iommus = <&mmss_bimc_smmu 0x580>,
+				<&mmss_bimc_smmu 0x586>;
+		};
+		secure_bitstream_cb {
+			compatible = "qcom,msm-vidc,context-bank";
+			label = "venus_sec_bitstream";
+			iommus = <&mmss_bimc_smmu 0x500>,
+				<&mmss_bimc_smmu 0x502>,
+				<&mmss_bimc_smmu 0x509>,
+				<&mmss_bimc_smmu 0x50a>,
+				<&mmss_bimc_smmu 0x50b>,
+				<&mmss_bimc_smmu 0x50e>,
+				<&mmss_bimc_smmu 0x526>,
+				<&mmss_bimc_smmu 0x529>,
+				<&mmss_bimc_smmu 0x52b>;
+			buffer-types = <0x241>;
+			virtual-addr-pool = <0x4b000000 0x25800000>;
+			qcom,secure-context-bank;
+		};
+
+		venus_secure_pixel_cb: secure_pixel_cb {
+			compatible = "qcom,msm-vidc,context-bank";
+			label = "venus_sec_pixel";
+			iommus = <&mmss_bimc_smmu 0x504>,
+				<&mmss_bimc_smmu 0x50c>,
+				<&mmss_bimc_smmu 0x510>,
+				<&mmss_bimc_smmu 0x52c>;
+			buffer-types = <0x106>;
+			virtual-addr-pool = <0x25800000 0x25800000>;
+			qcom,secure-context-bank;
+		};
+
+		venus_secure_non_pixel_cb: secure_non_pixel_cb {
+			compatible = "qcom,msm-vidc,context-bank";
+			label = "venus_sec_non_pixel";
+			iommus = <&mmss_bimc_smmu 0x505>,
+				<&mmss_bimc_smmu 0x507>,
+				<&mmss_bimc_smmu 0x508>,
+				<&mmss_bimc_smmu 0x50d>,
+				<&mmss_bimc_smmu 0x50f>,
+				<&mmss_bimc_smmu 0x525>,
+				<&mmss_bimc_smmu 0x528>,
+				<&mmss_bimc_smmu 0x52d>,
+				<&mmss_bimc_smmu 0x540>;
+			buffer-types = <0x480>;
+			virtual-addr-pool = <0x1000000 0x24800000>;
+			qcom,secure-context-bank;
+		};
+	};
+};
diff --git a/arch/arm/boot/dts/qcom/msmfalcon.dtsi b/arch/arm/boot/dts/qcom/msmfalcon.dtsi
index 4619b835cb11..5c69fb13078b 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msmfalcon.dtsi
@@ -474,8 +474,21 @@
 	};
 
 	clock_gfx: clock-controller@5065000 {
-		compatible = "qcom,dummycc";
-		clock-output-names = "gfx_clocks";
+		compatible = "qcom,gpucc-msmfalcon";
+		reg = <0x5065000 0x10000>;
+		vdd_dig_gfx-supply = <&pm2falcon_s3_level>;
+		vdd_mx_gfx-supply = <&pm2falcon_s5_level>;
+		vdd_gfx-supply = <&gfx_vreg_corner>;
+		qcom,gfxfreq-corner =
+			< 0         0>,
+			< 160000000 1>,  /* MinSVS */
+			< 266000000 2>,  /* LowSVS */
+			< 370000000 3>,  /* SVS    */
+			< 465000000 4>,  /* SVS_L1 */
+			< 588000000 5>,  /* NOM    */
+			< 647000000 6>,  /* NOM_L1 */
+			< 700000000 7>,  /* TURBO */
+			< 750000000 7>;  /* TURBO  */
 		#clock-cells = <1>;
 		#reset-cells = <1>;
 	};
@@ -1024,10 +1037,8 @@
 };
 
 &gdsc_gpu_gx {
-	clock-names = "bimc_core_clk", "core_clk", "core_root_clk";
-	clocks = <&clock_gcc GCC_GPU_BIMC_GFX_CLK>,
-		 <&clock_gfx GPUCC_GFX3D_CLK>,
-		 <&clock_gfx GFX3D_CLK_SRC>;
+	clock-names = "core_root_clk";
+	clocks = <&clock_gfx GFX3D_CLK_SRC>;
 	qcom,force-enable-root-clk;
 	parent-supply = <&gfx_vreg_corner>;
 	status = "ok";
@@ -1041,3 +1052,4 @@
 #include "msm-arm-smmu-impl-defs-falcon.dtsi"
 #include "msmfalcon-common.dtsi"
 #include "msmfalcon-blsp.dtsi"
+#include "msmfalcon-vidc.dtsi"
diff --git a/arch/arm/boot/dts/qcom/msmhamster-cdp.dts b/arch/arm/boot/dts/qcom/msmhamster-cdp.dts
index dcb4b0830da3..a9a3e6d9f88a 100644
--- a/arch/arm/boot/dts/qcom/msmhamster-cdp.dts
+++ b/arch/arm/boot/dts/qcom/msmhamster-cdp.dts
@@ -14,7 +14,7 @@
 /dts-v1/;
 
 #include "msmhamster.dtsi"
-#include "msmcobalt-cdp.dtsi"
+#include "msm8998-cdp.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM HAMSTER";
diff --git a/arch/arm/boot/dts/qcom/msmhamster-mtp.dts b/arch/arm/boot/dts/qcom/msmhamster-mtp.dts
index 72106c97db40..5d63fcb88e8a 100644
--- a/arch/arm/boot/dts/qcom/msmhamster-mtp.dts
+++ b/arch/arm/boot/dts/qcom/msmhamster-mtp.dts
@@ -14,7 +14,7 @@
 /dts-v1/;
 
 #include "msmhamster.dtsi"
-#include "msmcobalt-mtp.dtsi"
+#include "msm8998-mtp.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM HAMSTER";
diff --git a/arch/arm/boot/dts/qcom/msmhamster-rumi.dts b/arch/arm/boot/dts/qcom/msmhamster-rumi.dts
index ac95d1f6618d..250fe060a9af 100644
--- a/arch/arm/boot/dts/qcom/msmhamster-rumi.dts
+++ b/arch/arm/boot/dts/qcom/msmhamster-rumi.dts
@@ -15,7 +15,7 @@
 /memreserve/ 0x90000000 0x00000100;
 
 #include "msmhamster.dtsi"
-#include "msmcobalt-rumi.dtsi"
+#include "msm8998-rumi.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM HAMSTER RUMI";
diff --git a/arch/arm/boot/dts/qcom/msmhamster.dtsi b/arch/arm/boot/dts/qcom/msmhamster.dtsi
index 952740ae54e8..30308182e199 100644
--- a/arch/arm/boot/dts/qcom/msmhamster.dtsi
+++ b/arch/arm/boot/dts/qcom/msmhamster.dtsi
@@ -13,10 +13,10 @@
 /*
  * As a general rule, only version-specific property overrides should be placed
  * inside this file. Common device definitions should be placed inside the
- * msmcobalt.dtsi file.
+ * msm8998.dtsi file.
  */
 
-#include "msmcobalt-v2.dtsi"
+#include "msm8998-v2.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM HAMSTER";
diff --git a/arch/arm/boot/dts/qcom/msmtriton-rumi.dts b/arch/arm/boot/dts/qcom/msmtriton-rumi.dts
index 08809fb38cae..491b55aab9a6 100644
--- a/arch/arm/boot/dts/qcom/msmtriton-rumi.dts
+++ b/arch/arm/boot/dts/qcom/msmtriton-rumi.dts
@@ -63,3 +63,8 @@
 	compatible = "qcom,dummycc";
 	clock-output-names = "gcc_clocks";
 };
+
+&clock_gfx {
+	compatible = "qcom,dummycc";
+	clock-output-names = "gfx_clocks";
+};
diff --git a/arch/arm/boot/dts/qcom/msmtriton.dtsi b/arch/arm/boot/dts/qcom/msmtriton.dtsi
index e9e211188800..261a3a526d14 100644
--- a/arch/arm/boot/dts/qcom/msmtriton.dtsi
+++ b/arch/arm/boot/dts/qcom/msmtriton.dtsi
@@ -389,8 +389,21 @@
 	};
 
 	clock_gfx: clock-controller@5065000 {
-		compatible = "qcom,dummycc";
-		clock-output-names = "gfx_clocks";
+		compatible = "qcom,gpucc-msmfalcon";
+		reg = <0x5065000 0x10000>;
+		vdd_dig_gfx-supply = <&pm2falcon_s3_level>;
+		vdd_mx_gfx-supply = <&pm2falcon_s5_level>;
+		vdd_gfx-supply = <&gfx_vreg_corner>;
+		qcom,gfxfreq-corner =
+			< 0         0>,
+			< 160000000 1>,  /* MinSVS */
+			< 266000000 2>,  /* LowSVS */
+			< 370000000 3>,  /* SVS    */
+			< 465000000 4>,  /* SVS_L1 */
+			< 588000000 5>,  /* NOM    */
+			< 647000000 6>,  /* NOM_L1 */
+			< 700000000 7>,  /* TURBO  */
+			< 750000000 7>;  /* TURBO  */
 		#clock-cells = <1>;
 		#reset-cells = <1>;
 	};
@@ -828,10 +841,8 @@
 };
 
 &gdsc_gpu_gx {
-	clock-names = "bimc_core_clk", "core_clk", "core_root_clk";
-	clocks = <&clock_gcc GCC_GPU_BIMC_GFX_CLK>,
-		 <&clock_gfx GPUCC_GFX3D_CLK>,
-		 <&clock_gfx GFX3D_CLK_SRC>;
+	clock-names = "core_root_clk";
+	clocks = <&clock_gfx GFX3D_CLK_SRC>;
 	qcom,force-enable-root-clk;
 	parent-supply = <&gfx_vreg_corner>;
 	status = "ok";
diff --git a/arch/arm/configs/msmcortex_defconfig b/arch/arm/configs/msmcortex_defconfig
index f8743e760054..b55857fd7cc4 100644
--- a/arch/arm/configs/msmcortex_defconfig
+++ b/arch/arm/configs/msmcortex_defconfig
@@ -288,7 +288,7 @@ CONFIG_SPI=y
 CONFIG_SPI_QUP=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPMI=y
-CONFIG_PINCTRL_MSMCOBALT=y
+CONFIG_PINCTRL_MSM8998=y
 CONFIG_PINCTRL_MSMFALCON=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_QPNP_PIN=y
diff --git a/arch/arm/configs/msmfalcon_defconfig b/arch/arm/configs/msmfalcon_defconfig
index d10fba1dc4b5..abd89c1ca060 100644
--- a/arch/arm/configs/msmfalcon_defconfig
+++ b/arch/arm/configs/msmfalcon_defconfig
@@ -289,7 +289,7 @@ CONFIG_SPI=y
 CONFIG_SPI_QUP=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPMI=y
-CONFIG_PINCTRL_MSMCOBALT=y
+CONFIG_PINCTRL_MSM8998=y
 CONFIG_PINCTRL_MSMFALCON=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_QPNP_PIN=y
@@ -422,7 +422,7 @@ CONFIG_RMNET_IPA3=y
 CONFIG_GPIO_USB_DETECT=y
 CONFIG_USB_BAM=y
 CONFIG_QCOM_CLK_SMD_RPM=y
-CONFIG_MSM_GCC_FALCON=y
+CONFIG_MSM_GPUCC_FALCON=y
 CONFIG_REMOTE_SPINLOCK_MSM=y
 CONFIG_ARM_SMMU=y
 CONFIG_IOMMU_DEBUG=y
diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index cbccbeb483c9..a4fba1af7744 100644
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -2,7 +2,7 @@ if ARCH_QCOM
 menu "QCOM SoC Type"
 
 config ARCH_MSMFALCON
-        bool "Enable Support for Qualcomm MSMFALCON"
+        bool "Enable Support for MSMFALCON"
 	select CLKDEV_LOOKUP
 	select HAVE_CLK
 	select HAVE_CLK_PREPARE
@@ -40,7 +40,7 @@ config ARCH_MSMFALCON
 	wish to build a kernel that runs on this chipset, say 'N' here.
 
 config ARCH_MSMTRITON
-        bool "Enable Support for Qualcomm MSMTRITON"
+        bool "Enable Support for MSMTRITON"
 	select CLKDEV_LOOKUP
 	select HAVE_CLK
 	select HAVE_CLK_PREPARE
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 94c0bf30c284..56b7f310ddbc 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -69,12 +69,12 @@ config ARCH_MSM8996
 	This enables support for the MSM8996 chipset. If you do not
 	wish to build a kernel that runs on this chipset, say 'N' here.
 
-config ARCH_MSMCOBALT
-        bool "Enable Support for Qualcomm MSMCOBALT"
+config ARCH_MSM8998
+        bool "Enable Support for Qualcomm MSM8998"
 	depends on ARCH_QCOM
 	select COMMON_CLK_MSM
 	help
-	This enables support for the MSMCOBALT chipset. If you do not
+	This enables support for the MSM8998 chipset. If you do not
 	wish to build a kernel that runs on this chipset, say 'N' here.
 
 config ARCH_MSMHAMSTER
diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig
index 3990bece1dd1..23287f8d06ea 100644
--- a/arch/arm64/configs/msmcortex-perf_defconfig
+++ b/arch/arm64/configs/msmcortex-perf_defconfig
@@ -45,7 +45,7 @@ CONFIG_MODULE_SIG_FORCE=y
 CONFIG_MODULE_SIG_SHA512=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_MSMCOBALT=y
+CONFIG_ARCH_MSM8998=y
 CONFIG_ARCH_MSMHAMSTER=y
 CONFIG_PCI=y
 CONFIG_PCI_MSM=y
@@ -301,7 +301,7 @@ CONFIG_SPI=y
 CONFIG_SPI_QUP=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPMI=y
-CONFIG_PINCTRL_MSMCOBALT=y
+CONFIG_PINCTRL_MSM8998=y
 CONFIG_PINCTRL_MSMFALCON=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
@@ -405,7 +405,7 @@ CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_USB_AUDIO_QMI=y
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_MSMCOBALT=y
+CONFIG_SND_SOC_MSM8998=y
 CONFIG_UHID=y
 CONFIG_HID_APPLE=y
 CONFIG_HID_ELECOM=y
diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig
index 15ca50859eca..9cec02c83936 100644
--- a/arch/arm64/configs/msmcortex_defconfig
+++ b/arch/arm64/configs/msmcortex_defconfig
@@ -46,7 +46,7 @@ CONFIG_MODULE_SIG_SHA512=y
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_MSMCOBALT=y
+CONFIG_ARCH_MSM8998=y
 CONFIG_ARCH_MSMHAMSTER=y
 CONFIG_PCI=y
 CONFIG_PCI_MSM=y
@@ -304,7 +304,7 @@ CONFIG_SPI=y
 CONFIG_SPI_QUP=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPMI=y
-CONFIG_PINCTRL_MSMCOBALT=y
+CONFIG_PINCTRL_MSM8998=y
 CONFIG_PINCTRL_MSMFALCON=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
@@ -408,7 +408,7 @@ CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_USB_AUDIO_QMI=y
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_MSMCOBALT=y
+CONFIG_SND_SOC_MSM8998=y
 CONFIG_UHID=y
 CONFIG_HID_APPLE=y
 CONFIG_HID_ELECOM=y
diff --git a/arch/arm64/configs/msmfalcon-perf_defconfig b/arch/arm64/configs/msmfalcon-perf_defconfig
index df695f993ed9..1074672d252f 100644
--- a/arch/arm64/configs/msmfalcon-perf_defconfig
+++ b/arch/arm64/configs/msmfalcon-perf_defconfig
@@ -304,7 +304,7 @@ CONFIG_SPI=y
 CONFIG_SPI_QUP=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPMI=y
-CONFIG_PINCTRL_MSMCOBALT=y
+CONFIG_PINCTRL_MSM8998=y
 CONFIG_PINCTRL_MSMFALCON=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
@@ -408,7 +408,7 @@ CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_USB_AUDIO_QMI=y
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_MSMCOBALT=y
+CONFIG_SND_SOC_MSM8998=y
 CONFIG_UHID=y
 CONFIG_HID_APPLE=y
 CONFIG_HID_ELECOM=y
@@ -489,7 +489,7 @@ CONFIG_GPIO_USB_DETECT=y
 CONFIG_SEEMP_CORE=y
 CONFIG_USB_BAM=y
 CONFIG_QCOM_CLK_SMD_RPM=y
-CONFIG_MSM_GCC_FALCON=y
+CONFIG_MSM_GPUCC_FALCON=y
 CONFIG_REMOTE_SPINLOCK_MSM=y
 CONFIG_IOMMU_IO_PGTABLE_FAST=y
 CONFIG_ARM_SMMU=y
diff --git a/arch/arm64/configs/msmfalcon_defconfig b/arch/arm64/configs/msmfalcon_defconfig
index 8719eb7cb92e..6d8d9eeab2d5 100644
--- a/arch/arm64/configs/msmfalcon_defconfig
+++ b/arch/arm64/configs/msmfalcon_defconfig
@@ -307,7 +307,6 @@ CONFIG_SPI=y
 CONFIG_SPI_QUP=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPMI=y
-CONFIG_PINCTRL_MSMCOBALT=y
 CONFIG_PINCTRL_MSMFALCON=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
@@ -411,7 +410,7 @@ CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_USB_AUDIO_QMI=y
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_MSMCOBALT=y
+CONFIG_SND_SOC_MSM8998=y
 CONFIG_UHID=y
 CONFIG_HID_APPLE=y
 CONFIG_HID_ELECOM=y
@@ -499,7 +498,7 @@ CONFIG_GPIO_USB_DETECT=y
 CONFIG_SEEMP_CORE=y
 CONFIG_USB_BAM=y
 CONFIG_QCOM_CLK_SMD_RPM=y
-CONFIG_MSM_GCC_FALCON=y
+CONFIG_MSM_GPUCC_FALCON=y
 CONFIG_REMOTE_SPINLOCK_MSM=y
 CONFIG_IOMMU_IO_PGTABLE_FAST=y
 CONFIG_IOMMU_IO_PGTABLE_FAST_SELFTEST=y