diff --git a/qcom/Makefile b/qcom/Makefile
index bfed4e46fb8f..7377c74014d1 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -16,17 +16,18 @@ dtbo-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi-overlay.dtbo \
 
 lahaina-rumi-overlay.dtbo-base := lahaina.dtb
 lahaina-mtp-hsp-overlay.dtbo-base := lahaina.dtb
-lahaina-mtp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb
-lahaina-cdp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb
-lahaina-atp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb
+lahaina-mtp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb
+lahaina-cdp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb
+lahaina-atp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb
 lahaina-qrd-hsp-overlay.dtbo-base := lahaina.dtb
-lahaina-qrd-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb
+lahaina-qrd-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb lahaina-v2.1.dtb
 lahaina-qrd-module-overlay.dtbo-base := lahaina.dtb
-lahainap-mtp-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb
-lahainap-cdp-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb
-lahainap-atp-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb
-lahainap-qrd-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb
-lahaina-cdp-v2.2-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb
+lahainap-mtp-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb lahainap-v2.1.dtb
+lahainap-cdp-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb lahainap-v2.1.dtb
+lahainap-atp-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb lahainap-v2.1.dtb
+lahainap-qrd-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb lahainap-v2.1.dtb
+lahaina-cdp-v2.2-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb \
+					lahaina-v2.1.dtb
 else
 dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \
 	lahaina-mtp-hsp.dtb \
@@ -48,7 +49,15 @@ dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \
 	lahainap-v2-cdp.dtb \
 	lahainap-v2-atp.dtb \
 	lahainap-v2-qrd.dtb \
-	lahaina-cdp-v2.2.dtb
+	lahaina-cdp-v2.2.dtb \
+	lahaina-v2.1-mtp.dtb \
+	lahaina-v2.1-cdp.dtb \
+	lahaina-v2.1-atp.dtb \
+	lahaina-v2.1-qrd.dtb \
+	lahainap-v2.1-mtp.dtb \
+	lahainap-v2.1-cdp.dtb \
+	lahainap-v2.1-atp.dtb \
+	lahainap-v2.1-qrd.dtb
 endif
 
 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
diff --git a/qcom/lahaina-v2.1-atp.dts b/qcom/lahaina-v2.1-atp.dts
new file mode 100644
index 000000000000..90a7abbda8ab
--- /dev/null
+++ b/qcom/lahaina-v2.1-atp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahaina-v2.1.dtsi"
+#include "lahaina-atp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina v2.1 ATP";
+	compatible = "qcom,lahaina-atp", "qcom,lahaina", "qcom,atp";
+	qcom,board-id = <0x10021 0>;
+};
diff --git a/qcom/lahaina-v2.1-cdp.dts b/qcom/lahaina-v2.1-cdp.dts
new file mode 100644
index 000000000000..1e52f262286f
--- /dev/null
+++ b/qcom/lahaina-v2.1-cdp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahaina-v2.1.dtsi"
+#include "lahaina-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina V2.1 CDP";
+	compatible = "qcom,lahaina-cdp", "qcom,lahaina", "qcom,cdp";
+	qcom,board-id = <0x10001 0>;
+};
diff --git a/qcom/lahaina-v2.1-mtp.dts b/qcom/lahaina-v2.1-mtp.dts
new file mode 100644
index 000000000000..d4c650abf266
--- /dev/null
+++ b/qcom/lahaina-v2.1-mtp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahaina-v2.1.dtsi"
+#include "lahaina-mtp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina V2.1 MTP";
+	compatible = "qcom,lahaina-mtp", "qcom,lahaina", "qcom,mtp";
+	qcom,board-id = <0x10008 0>;
+};
diff --git a/qcom/lahaina-v2.1-qrd.dts b/qcom/lahaina-v2.1-qrd.dts
new file mode 100644
index 000000000000..8e146b255bc6
--- /dev/null
+++ b/qcom/lahaina-v2.1-qrd.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahaina-v2.1.dtsi"
+#include "lahaina-qrd.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina V2.1 QRD";
+	compatible = "qcom,lahaina-qrd", "qcom,lahaina", "qcom,qrd";
+	qcom,board-id = <0x1000B 0>;
+};
diff --git a/qcom/lahaina-v2.1.dts b/qcom/lahaina-v2.1.dts
new file mode 100644
index 000000000000..683fbeff5f3d
--- /dev/null
+++ b/qcom/lahaina-v2.1.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "lahaina-v2.1.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina V2.1 SoC";
+	compatible = "qcom,lahaina";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/lahaina-v2.1.dtsi b/qcom/lahaina-v2.1.dtsi
new file mode 100644
index 000000000000..4e196162c1bb
--- /dev/null
+++ b/qcom/lahaina-v2.1.dtsi
@@ -0,0 +1,7 @@
+#include "lahaina-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina v2.1";
+	compatible = "qcom,lahaina";
+	qcom,msm-id = <415 0x20001>, <456 0x20001>;
+};
diff --git a/qcom/lahainap-v2.1-atp.dts b/qcom/lahainap-v2.1-atp.dts
new file mode 100644
index 000000000000..0ea73a668a92
--- /dev/null
+++ b/qcom/lahainap-v2.1-atp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahainap-v2.1.dtsi"
+#include "lahainap-atp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. LahainaP v2.1 ATP";
+	compatible = "qcom,lahainap-atp", "qcom,lahainap", "qcom,atp";
+	qcom,board-id = <0x10021 0>;
+};
diff --git a/qcom/lahainap-v2.1-cdp.dts b/qcom/lahainap-v2.1-cdp.dts
new file mode 100644
index 000000000000..8e169b30453c
--- /dev/null
+++ b/qcom/lahainap-v2.1-cdp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahainap-v2.1.dtsi"
+#include "lahainap-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. LahainaP v2.1 CDP";
+	compatible = "qcom,lahainap-cdp", "qcom,lahainap", "qcom,cdp";
+	qcom,board-id = <0x10001 0>;
+};
diff --git a/qcom/lahainap-v2.1-mtp.dts b/qcom/lahainap-v2.1-mtp.dts
new file mode 100644
index 000000000000..4187185f5d41
--- /dev/null
+++ b/qcom/lahainap-v2.1-mtp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahainap-v2.1.dtsi"
+#include "lahainap-mtp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. LahainaP v2.1 MTP";
+	compatible = "qcom,lahainap-mtp", "qcom,lahainap", "qcom,mtp";
+	qcom,board-id = <0x10008 0>;
+};
diff --git a/qcom/lahainap-v2.1-qrd.dts b/qcom/lahainap-v2.1-qrd.dts
new file mode 100644
index 000000000000..8eda155e5bc3
--- /dev/null
+++ b/qcom/lahainap-v2.1-qrd.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahainap-v2.1.dtsi"
+#include "lahainap-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. LahainaP v2.1 QRD";
+	compatible = "qcom,lahainap-qrd", "qcom,lahainap", "qcom,qrd";
+	qcom,board-id = <0x1000B 0>;
+};
diff --git a/qcom/lahainap-v2.1.dts b/qcom/lahainap-v2.1.dts
new file mode 100644
index 000000000000..e23bdf055819
--- /dev/null
+++ b/qcom/lahainap-v2.1.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "lahainap-v2.1.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. LahianaP v2.1 SoC";
+	compatible = "qcom,lahainap";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/lahainap-v2.1.dtsi b/qcom/lahainap-v2.1.dtsi
new file mode 100644
index 000000000000..99f51cf73f39
--- /dev/null
+++ b/qcom/lahainap-v2.1.dtsi
@@ -0,0 +1,7 @@
+#include "lahainap-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. LahainaP v2.1";
+	compatible = "qcom,lahainap";
+	qcom,msm-id = <439 0x20001>;
+};