From bb8d007df8c7ae782130db939a5c5f6ec56ee66d Mon Sep 17 00:00:00 2001
From: Nagireddy Annem <nannem@qti.qualcomm.com>
Date: Wed, 19 May 2021 09:35:57 +0530
Subject: [PATCH] ARM: dts: msm: Correct syntax error and reorder dts variants
 for monaco

Correct dts file name in makefile and inherit default
variant in other variants of monaco.

Change-Id: Ib0f90fb287e909cc0f59e7fe533db9c10bb88dae
---
 qcom/Makefile                      | 2 +-
 qcom/monaco-idp-v1-common.dtsi     | 0
 qcom/monaco-idp-v1.dtsi            | 2 +-
 qcom/monaco-idp-v2.dtsi            | 1 +
 qcom/monaco-idp-v3.dtsi            | 1 +
 qcom/monaco-standalone-idp-v1.dtsi | 2 +-
 qcom/monaco-standalone-idp-v2.dtsi | 1 +
 qcom/monaco-standalone-idp-v3.dtsi | 1 +
 8 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 qcom/monaco-idp-v1-common.dtsi

diff --git a/qcom/Makefile b/qcom/Makefile
index 51ff557384fa..bb183d157656 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -256,7 +256,7 @@ dtbo-$(CONFIG_ARCH_MONACO) +=    \
 	monaco-standalone-idp-v1-overlay.dtbo \
 	monaco-standalone-idp-v2-overlay.dtbo \
 	monaco-standalone-idp-v3-overlay.dtbo \
-	monaco-idp-v1-verlay.dtbo \
+	monaco-idp-v1-overlay.dtbo \
 	monaco-idp-v2-overlay.dtbo \
 	monaco-idp-v3-overlay.dtbo
 
diff --git a/qcom/monaco-idp-v1-common.dtsi b/qcom/monaco-idp-v1-common.dtsi
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qcom/monaco-idp-v1.dtsi b/qcom/monaco-idp-v1.dtsi
index 1147544aa013..13fa035a9467 100644
--- a/qcom/monaco-idp-v1.dtsi
+++ b/qcom/monaco-idp-v1.dtsi
@@ -1,4 +1,4 @@
-
+#include "monaco-idp-v1-common.dtsi"
 &sdhc_1 {
 	status = "ok";
 
diff --git a/qcom/monaco-idp-v2.dtsi b/qcom/monaco-idp-v2.dtsi
index e69de29bb2d1..6fea5bc4f643 100644
--- a/qcom/monaco-idp-v2.dtsi
+++ b/qcom/monaco-idp-v2.dtsi
@@ -0,0 +1 @@
+#include "monaco-idp-v1.dtsi"
diff --git a/qcom/monaco-idp-v3.dtsi b/qcom/monaco-idp-v3.dtsi
index e69de29bb2d1..6fea5bc4f643 100644
--- a/qcom/monaco-idp-v3.dtsi
+++ b/qcom/monaco-idp-v3.dtsi
@@ -0,0 +1 @@
+#include "monaco-idp-v1.dtsi"
diff --git a/qcom/monaco-standalone-idp-v1.dtsi b/qcom/monaco-standalone-idp-v1.dtsi
index 1147544aa013..13fa035a9467 100644
--- a/qcom/monaco-standalone-idp-v1.dtsi
+++ b/qcom/monaco-standalone-idp-v1.dtsi
@@ -1,4 +1,4 @@
-
+#include "monaco-idp-v1-common.dtsi"
 &sdhc_1 {
 	status = "ok";
 
diff --git a/qcom/monaco-standalone-idp-v2.dtsi b/qcom/monaco-standalone-idp-v2.dtsi
index e69de29bb2d1..d8a5c8c6f1a8 100644
--- a/qcom/monaco-standalone-idp-v2.dtsi
+++ b/qcom/monaco-standalone-idp-v2.dtsi
@@ -0,0 +1 @@
+#include "monaco-standalone-idp-v1.dtsi"
diff --git a/qcom/monaco-standalone-idp-v3.dtsi b/qcom/monaco-standalone-idp-v3.dtsi
index e69de29bb2d1..d8a5c8c6f1a8 100644
--- a/qcom/monaco-standalone-idp-v3.dtsi
+++ b/qcom/monaco-standalone-idp-v3.dtsi
@@ -0,0 +1 @@
+#include "monaco-standalone-idp-v1.dtsi"