arm: dts: msm: add msm8996-auto.dtsi

Add msm8996-auto.dtsi file to override auto specific
node information and include in the auto dts files.

Change-Id: Idf724a8f2e6b43ddc6c563245fb8dfa0755182ee
Signed-off-by: Firoz Khan <firozk@codeaurora.org>

8 files changed, 37 insertions, 8 deletions

diff --git a/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts
index 7fa5b2850635..51b21238c32a 100644
--- a/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2019, 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
@@ -16,6 +16,7 @@
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-auto-cdp.dtsi"
 #include "msm8996pro-auto.dtsi"
+#include "msm8996-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. APQ 8096 pro AUTO CDP";
diff --git a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts
index c2d9f6696307..4d7e66324f9e 100644
--- a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts
+++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2019, 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
@@ -17,6 +17,7 @@
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-agave-adp.dtsi"
 #include "msm8996pro-auto.dtsi"
+#include "msm8996-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. APQ 8096pro V1.1 AUTO ADP LITE";
diff --git a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts
index 9ca38fcac0bb..4dd06be498cb 100644
--- a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2019, 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
@@ -17,6 +17,7 @@
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-agave-adp.dtsi"
 #include "msm8996pro-auto.dtsi"
+#include "msm8996-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8996pro AUTO ADP";
diff --git a/arch/arm/boot/dts/qcom/msm8996-auto.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto.dtsi
new file mode 100644
index 000000000000..4a60b3dae021
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msm8996-auto.dtsi
@@ -0,0 +1,23 @@
+/* Copyright (c) 2014-2019, 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.
+ */
+
+&vendor {
+	fsmgr_flags = "wait,slotselect,verify";
+};
+
+&peripheral_mem {
+	reg = <0 0x8ea00000 0 0x2b00000>;
+};
+
+&cont_splash_mem_hdmi {
+	reg = <0 0xbdd00000 0 0x23ff000>;
+};
diff --git a/arch/arm/boot/dts/qcom/msm8996.dtsi b/arch/arm/boot/dts/qcom/msm8996.dtsi
index 4ca58d03115c..ce2a570a926c 100644
--- a/arch/arm/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2019, 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
@@ -182,7 +182,7 @@
 			compatible = "android,firmware";
 			fstab {
 				compatible = "android,fstab";
-				vendor {
+				vendor: vendor {
 					compatible = "android,vendor";
 					dev = "/dev/block/platform/soc/7464900.sdhci/by-name/vendor";
 					type = "ext4";
diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts
index 46140abca7cf..1b3d07714caf 100644
--- a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts
+++ b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2019, 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
@@ -17,6 +17,7 @@
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-agave-adp.dtsi"
 #include "msm8996pro-auto.dtsi"
+#include "msm8996-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8996pro AUTO ADP LITE";
diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts
index 75631bbb56b8..e17556ac43be 100644
--- a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts
+++ b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2019, 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
@@ -17,6 +17,7 @@
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-agave-adp.dtsi"
 #include "msm8996pro-auto.dtsi"
+#include "msm8996-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8996pro AUTO ADP";
diff --git a/arch/arm/boot/dts/qcom/msm8996pro-v1.1-auto-cdp.dts b/arch/arm/boot/dts/qcom/msm8996pro-v1.1-auto-cdp.dts
index d798d9e163f2..614945edb144 100644
--- a/arch/arm/boot/dts/qcom/msm8996pro-v1.1-auto-cdp.dts
+++ b/arch/arm/boot/dts/qcom/msm8996pro-v1.1-auto-cdp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2019, 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
@@ -16,6 +16,7 @@
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-auto-cdp.dtsi"
 #include "msm8996pro-auto.dtsi"
+#include "msm8996-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8996pro v1.1 AUTO CDP";