Merge "ARM: dts: msm: Add initial device tree for khaje"

12 files changed, 111 insertions, 0 deletions

diff --git a/bindings/arm/msm/msm.txt b/bindings/arm/msm/msm.txt
index 0660e025..5322590a 100644
--- a/bindings/arm/msm/msm.txt
+++ b/bindings/arm/msm/msm.txt
@@ -59,6 +59,9 @@ SoCs:
 - BENGAL
   compatible = "qcom,bengal"
 
+- KHAJE
+  compatible = "qcom,khaje"
+
 - SCUBA
   compatible = "qcom,scuba"
 
@@ -247,6 +250,7 @@ compatible = "qcom,bengal-qrd"
 compatible = "qcom,bengal-idp"
 compatible = "qcom,bengalp"
 compatible = "qcom,bengalp-idp"
+compatible = "qcom,khaje-idp"
 compatible = "qcom,scuba-rumi"
 compatible = "qcom,scuba-idp"
 compatible = "qcom,scuba-qrd"
diff --git a/qcom/Makefile b/qcom/Makefile
index 3f893346..377030cf 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -229,6 +229,18 @@ dtb-$(CONFIG_ARCH_SCUBA) += scuba-rumi.dtb \
 endif
 
 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
+        dtbo-$(CONFIG_ARCH_KHAJE) += \
+		khaje-idp-overlay.dtbo \
+		khaje-idp-nopmi-overlay.dtbo
+
+khaje-idp-overlay.dtbo-base := khaje.dtb
+khaje-idp-nopmi-overlay.dtbo-base := khaje.dtb
+else
+dtb-$(CONFIG_ARCH_KHAJE) += khaje-idp.dtb \
+		khaje-idp-nopmi.dtb
+endif
+
+ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
         dtbo-$(CONFIG_ARCH_SDM660) += \
                 sdm660-mtp-external-codec-overlay.dtbo \
                 sdm660-mtp-internal-codec-overlay.dtbo \
diff --git a/qcom/khaje-idp-nopmi-overlay.dts b/qcom/khaje-idp-nopmi-overlay.dts
new file mode 100644
index 00000000..baad62db
--- /dev/null
+++ b/qcom/khaje-idp-nopmi-overlay.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include "khaje-idp-nopmi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. KHAJE IDP nopmi";
+	compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp";
+	qcom,msm-id = <518 0x10000>;
+	qcom,board-id = <34 0>;
+	qcom,pmic-id = <0x2D 0x0 0x0 0x0>;
+};
diff --git a/qcom/khaje-idp-nopmi.dts b/qcom/khaje-idp-nopmi.dts
new file mode 100644
index 00000000..9c3ad4e9
--- /dev/null
+++ b/qcom/khaje-idp-nopmi.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "khaje.dtsi"
+#include "khaje-idp-nopmi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. KHAJE IDP nopmi";
+	compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp";
+	qcom,board-id = <34 0>;
+	qcom,pmic-id = <0x2D 0x0 0x0 0x0>;
+};
diff --git a/qcom/khaje-idp-nopmi.dtsi b/qcom/khaje-idp-nopmi.dtsi
new file mode 100644
index 00000000..d8410e7a
--- /dev/null
+++ b/qcom/khaje-idp-nopmi.dtsi
@@ -0,0 +1 @@
+#include "bengal-idp-nopmi.dtsi"
diff --git a/qcom/khaje-idp-overlay.dts b/qcom/khaje-idp-overlay.dts
new file mode 100644
index 00000000..cc64dfa0
--- /dev/null
+++ b/qcom/khaje-idp-overlay.dts
@@ -0,0 +1,14 @@
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include "khaje-idp.dtsi"
+#include "khaje-idp-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Khaje IDP";
+	compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp";
+	qcom,msm-id = <518 0x10000>;
+	qcom,board-id = <34 0>;
+	qcom,pmic-id = <0x2D 0x2E 0x0 0x0>;
+};
diff --git a/qcom/khaje-idp-pm7250b.dtsi b/qcom/khaje-idp-pm7250b.dtsi
new file mode 100644
index 00000000..6e1d96cc
--- /dev/null
+++ b/qcom/khaje-idp-pm7250b.dtsi
@@ -0,0 +1,24 @@
+#include "khaje-pm7250b.dtsi"
+
+&led_flash_rear {
+	/delete-property/ flash-source;
+	/delete-property/ torch-source;
+	/delete-property/ switch-source;
+};
+
+&led_flash_rear_aux {
+	/delete-property/ flash-source;
+	/delete-property/ torch-source;
+	/delete-property/ switch-source;
+};
+
+&led_flash_rear_aux2 {
+	/delete-property/ flash-source;
+	/delete-property/ torch-source;
+	/delete-property/ switch-source;
+};
+
+&sde_dsi {
+	/delete-property/ lab-supply;
+	/delete-property/ ibb-supply;
+};
diff --git a/qcom/khaje-idp.dts b/qcom/khaje-idp.dts
new file mode 100644
index 00000000..01afb970
--- /dev/null
+++ b/qcom/khaje-idp.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+#include "khaje.dtsi"
+#include "khaje-idp.dtsi"
+#include "khaje-idp-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. KHAJE IDP";
+	compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp";
+	qcom,board-id = <34 0>;
+	qcom,pmic-id = <0x2D 0x2E 0x0 0x0>;
+};
diff --git a/qcom/khaje-idp.dtsi b/qcom/khaje-idp.dtsi
new file mode 100644
index 00000000..eef3e49b
--- /dev/null
+++ b/qcom/khaje-idp.dtsi
@@ -0,0 +1 @@
+#include "bengal-idp.dtsi"
diff --git a/qcom/khaje-pm7250b.dtsi b/qcom/khaje-pm7250b.dtsi
new file mode 100644
index 00000000..594e2a5d
--- /dev/null
+++ b/qcom/khaje-pm7250b.dtsi
@@ -0,0 +1,3 @@
+/*update the 7250b as per khaje*/
+/*#include "pm7250b.dtsi"*/
+
diff --git a/qcom/khaje.dts b/qcom/khaje.dts
new file mode 100644
index 00000000..b522b78f
--- /dev/null
+++ b/qcom/khaje.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "khaje.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Khaje SoC";
+	compatible = "qcom,khaje";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/khaje.dtsi b/qcom/khaje.dtsi
new file mode 100644
index 00000000..f6f10995
--- /dev/null
+++ b/qcom/khaje.dtsi
@@ -0,0 +1,7 @@
+#include "bengal.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Khaje SoC";
+	compatible = "qcom,khaje";
+	qcom,msm-id = <518 0x10000>;
+};