diff --git a/qcom/Makefile b/qcom/Makefile
index 8abfd129..bfae374a 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -65,6 +65,23 @@ cinder-dtb-$(CONFIG_ARCH_CINDER) += cinder-rumi.dtb \
 	cinder-ru-idp.dtb \
 	cinder-du-idp.dtb
 dtb-y += $(cinder-dtb-y)
+
+SA8155_BASE_DTB += sa8155.dtb sa8155-v2.dtb
+SA8155P_BASE_DTB += sa8155p.dtb sa8155p-v2.dtb
+
+SA8155_BOARDS += \
+		 sa8155-adp-star-overlay.dtbo \
+		 sa8155-adp-air-overlay.dtbo
+
+SA8155P_BOARDS += \
+		       sa8155p-adp-star-overlay.dtbo \
+		       sa8155p-adp-air-overlay.dtbo
+
+gen3auto-dtb-$(CONFIG_ARCH_SA8155) += \
+	$(call add-overlays, $(SA8155_BOARDS),$(SA8155_BASE_DTB))\
+	$(call add-overlays, $(SA8155P_BOARDS),$(SA8155P_BASE_DTB))
+gen3auto-overlays-dtb-$(CONFIG_ARCH_SA8155) += $(SA8155_BOARDS) $(SA8155P_BOARDS) $(SA8155_BASE_DTB) $(SA8155P_BASE_DTB)
+dtb-y += $(gen3auto-dtb-y)
 endif
 
 ifeq ($(CONFIG_ARCH_KALAMA), y)
diff --git a/qcom/sa8155-adp-air-overlay.dts b/qcom/sa8155-adp-air-overlay.dts
new file mode 100644
index 00000000..a342483d
--- /dev/null
+++ b/qcom/sa8155-adp-air-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8155-adp-common.dtsi"
+
+/ {
+	model = "ADP-AIR";
+	compatible = "qcom,sa8155-v2-adp-air", "qcom,sa8155",
+		"qcom,adp-air";
+	qcom,board-id = <0X01000019 0>;
+};
diff --git a/qcom/sa8155-adp-common.dtsi b/qcom/sa8155-adp-common.dtsi
new file mode 100644
index 00000000..79aa6b2a
--- /dev/null
+++ b/qcom/sa8155-adp-common.dtsi
@@ -0,0 +1,7 @@
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/* Empty node to generate minimal overlay fragment */
+&soc {
+
+};
diff --git a/qcom/sa8155-adp-star-overlay.dts b/qcom/sa8155-adp-star-overlay.dts
new file mode 100644
index 00000000..13d64ac1
--- /dev/null
+++ b/qcom/sa8155-adp-star-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8155-adp-star.dtsi"
+
+/ {
+	model = "ADP-STAR";
+	compatible = "qcom,sa8155-adp-star", "qcom,sa8155",
+		"qcom,adp-star";
+	qcom,board-id = <25 0>;
+};
diff --git a/qcom/sa8155-adp-star.dtsi b/qcom/sa8155-adp-star.dtsi
new file mode 100644
index 00000000..3fd19bf8
--- /dev/null
+++ b/qcom/sa8155-adp-star.dtsi
@@ -0,0 +1 @@
+#include "sa8155-adp-common.dtsi"
diff --git a/qcom/sa8155-v1.dtsi b/qcom/sa8155-v1.dtsi
new file mode 100644
index 00000000..50d09d7a
--- /dev/null
+++ b/qcom/sa8155-v1.dtsi
@@ -0,0 +1,9 @@
+#include "sm8150.dtsi"
+#include "sa8155.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8155";
+	compatible = "qcom,sa8155";
+	qcom,msm-name = "SA8155 V1";
+	qcom,msm-id = <362 0x10000>;
+};
diff --git a/qcom/sa8155-v2.dts b/qcom/sa8155-v2.dts
new file mode 100644
index 00000000..d565663f
--- /dev/null
+++ b/qcom/sa8155-v2.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sa8155-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8155 v2 SoC";
+	compatible = "qcom,sa8155";
+	qcom,pmic-name = "PM8150";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/sa8155-v2.dtsi b/qcom/sa8155-v2.dtsi
new file mode 100644
index 00000000..09d9488c
--- /dev/null
+++ b/qcom/sa8155-v2.dtsi
@@ -0,0 +1,8 @@
+#include "sm8150-v2.dtsi"
+#include "sa8155.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8155 V2";
+	qcom,msm-name = "SA8155 V2";
+	qcom,msm-id = <362 0x20000>;
+};
diff --git a/qcom/sa8155.dts b/qcom/sa8155.dts
new file mode 100644
index 00000000..85a8196c
--- /dev/null
+++ b/qcom/sa8155.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sa8155-v1.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8155 SoC";
+	compatible = "qcom,sa8155";
+	qcom,pmic-name = "PM8150";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/sa8155.dtsi b/qcom/sa8155.dtsi
new file mode 100644
index 00000000..bbfa0b09
--- /dev/null
+++ b/qcom/sa8155.dtsi
@@ -0,0 +1 @@
+#include <dt-bindings/gpio/gpio.h>
diff --git a/qcom/sa8155p-adp-air-overlay.dts b/qcom/sa8155p-adp-air-overlay.dts
new file mode 100644
index 00000000..57ac3cae
--- /dev/null
+++ b/qcom/sa8155p-adp-air-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8155-adp-common.dtsi"
+
+/ {
+	model = "ADP-AIR";
+	compatible = "qcom,sa8155p-v2-adp-air", "qcom,sa8155p",
+		"qcom,adp-air";
+	qcom,board-id = <0x01000019 0>;
+};
diff --git a/qcom/sa8155p-adp-star-overlay.dts b/qcom/sa8155p-adp-star-overlay.dts
new file mode 100644
index 00000000..db8d3b48
--- /dev/null
+++ b/qcom/sa8155p-adp-star-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8155-adp-star.dtsi"
+
+/ {
+	model = "ADP-STAR";
+	compatible = "qcom,sa8155p-adp-star", "qcom,sa8155p",
+		"qcom,adp-star";
+	qcom,board-id = <25 0>;
+};
diff --git a/qcom/sa8155p-v2.dts b/qcom/sa8155p-v2.dts
new file mode 100644
index 00000000..57e5e093
--- /dev/null
+++ b/qcom/sa8155p-v2.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sa8155p-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8155P v2 SoC";
+	compatible = "qcom,sa8155p";
+	qcom,pmic-name = "PM8150";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/sa8155p-v2.dtsi b/qcom/sa8155p-v2.dtsi
new file mode 100644
index 00000000..ae4368c6
--- /dev/null
+++ b/qcom/sa8155p-v2.dtsi
@@ -0,0 +1,7 @@
+#include "sa8155-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8155P v2";
+	qcom,msm-name = "SA8155P v2";
+	qcom,msm-id = <367 0x20000>;
+};
diff --git a/qcom/sa8155p.dts b/qcom/sa8155p.dts
new file mode 100644
index 00000000..2b77e6fc
--- /dev/null
+++ b/qcom/sa8155p.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sa8155p.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8155P SoC";
+	compatible = "qcom,sa8155p";
+	qcom,pmic-name = "PM8150";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/sa8155p.dtsi b/qcom/sa8155p.dtsi
new file mode 100644
index 00000000..c5bce24b
--- /dev/null
+++ b/qcom/sa8155p.dtsi
@@ -0,0 +1,8 @@
+#include "sa8155-v1.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8155P ";
+	qcom,msm-name = "SA8155P V1";
+	compatible = "qcom,sa8155p";
+	qcom,msm-id = <367 0x10000>;
+};
diff --git a/qcom/sm8150-v2.dtsi b/qcom/sm8150-v2.dtsi
new file mode 100644
index 00000000..3f6b99c9
--- /dev/null
+++ b/qcom/sm8150-v2.dtsi
@@ -0,0 +1,7 @@
+#include "sm8150.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SM8150 V2";
+	qcom,msm-name = "SM8150 V2";
+	qcom,msm-id = <339 0x20000>;
+};
diff --git a/qcom/sm8150p-v2.dtsi b/qcom/sm8150p-v2.dtsi
new file mode 100644
index 00000000..19171ba4
--- /dev/null
+++ b/qcom/sm8150p-v2.dtsi
@@ -0,0 +1,7 @@
+#include "sm8150-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SM8150P v2";
+	qcom,msm-name = "SM8150P v2";
+	qcom,msm-id = <361 0x20000>;
+};
diff --git a/qcom/sm8150p.dtsi b/qcom/sm8150p.dtsi
new file mode 100644
index 00000000..c80c56a3
--- /dev/null
+++ b/qcom/sm8150p.dtsi
@@ -0,0 +1,7 @@
+#include "sm8150.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SM8150P v1";
+	qcom,msm-name = "SM8150P v1";
+	qcom,msm-id = <361 0x10000>;
+};