From 636cd0421c82fdb5d9dcb2da95c6a7b2f42d1257 Mon Sep 17 00:00:00 2001
From: Swetha Chikkaboraiah <schikk@codeaurora.org>
Date: Mon, 10 Jul 2017 11:36:21 +0530
Subject: [PATCH] BACKPORT: ARM: dts: msm: Mount the system partition during
 early init

Add support to early mount system partition so that system
modules can be loaded during early init for msm8226 and msm8974.

[haggertk:] Updated msm8974{,pro}/ as well so that {h,k}lte* pick
  up this change.

Change-Id: I9d75bec6ff9bada5ab2db6de2a58e40323aa6ca2
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
Signed-off-by: Nirmal Abraham <nabrah@codeaurora.org>
Signed-off-by: Bruno Martins <bgcngm@gmail.com>
Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>
---
 .../boot/dts/msm8226/msm8226-v1-sec-r01.dtsi   | 18 ++++++++++++++++++
 .../dts/msm8226/msm8226-v1-sec_ct01-r00.dtsi   | 18 ++++++++++++++++++
 arch/arm/boot/dts/msm8226/msm8226.dtsi         | 18 ++++++++++++++++++
 arch/arm/boot/dts/msm8226/msm8926-v2-sec.dtsi  | 18 ++++++++++++++++++
 4 files changed, 72 insertions(+)

diff --git a/arch/arm/boot/dts/msm8226/msm8226-v1-sec-r01.dtsi b/arch/arm/boot/dts/msm8226/msm8226-v1-sec-r01.dtsi
index 1360829eb2d..3375a14e305 100644
--- a/arch/arm/boot/dts/msm8226/msm8226-v1-sec-r01.dtsi
+++ b/arch/arm/boot/dts/msm8226/msm8226-v1-sec-r01.dtsi
@@ -25,6 +25,24 @@
 		uart102 = &uart0;
 	};
 
+	firmware: firmware {
+		android {
+			compatible = "android,firmware";
+			fstab {
+				compatible = "android,fstab";
+				system {
+					compatible = "android,system";
+					dev = "/dev/block/platform/msm_sdcc.1/by-name/system";
+					type = "ext4";
+					mnt_flags = "ro,barrier=1,discard";
+					fsmgr_flags = "wait";
+					status = "ok";
+				};
+
+			};
+		};
+	};
+
 	memory {
 		secure_mem: secure_region {
 			linux,contiguous-region;
diff --git a/arch/arm/boot/dts/msm8226/msm8226-v1-sec_ct01-r00.dtsi b/arch/arm/boot/dts/msm8226/msm8226-v1-sec_ct01-r00.dtsi
index e33db9e4c54..a3a99123092 100644
--- a/arch/arm/boot/dts/msm8226/msm8226-v1-sec_ct01-r00.dtsi
+++ b/arch/arm/boot/dts/msm8226/msm8226-v1-sec_ct01-r00.dtsi
@@ -25,6 +25,24 @@
 		/*uart102 = &uart0;*/
 	};
 
+	firmware: firmware {
+		android {
+			compatible = "android,firmware";
+			fstab {
+				compatible = "android,fstab";
+				system {
+					compatible = "android,system";
+					dev = "/dev/block/platform/msm_sdcc.1/by-name/system";
+					type = "ext4";
+					mnt_flags = "ro,barrier=1,discard";
+					fsmgr_flags = "wait";
+					status = "ok";
+				};
+
+			};
+		};
+	};
+
 	memory {
 		secure_mem: secure_region {
 			linux,contiguous-region;
diff --git a/arch/arm/boot/dts/msm8226/msm8226.dtsi b/arch/arm/boot/dts/msm8226/msm8226.dtsi
index 91caa13f902..5ff1f584468 100644
--- a/arch/arm/boot/dts/msm8226/msm8226.dtsi
+++ b/arch/arm/boot/dts/msm8226/msm8226.dtsi
@@ -25,6 +25,24 @@
 		/*uart102 = &uart0;*/
 	};
 
+	firmware: firmware {
+		android {
+			compatible = "android,firmware";
+			fstab {
+				compatible = "android,fstab";
+				system {
+					compatible = "android,system";
+					dev = "/dev/block/platform/msm_sdcc.1/by-name/system";
+					type = "ext4";
+					mnt_flags = "ro,barrier=1,discard";
+					fsmgr_flags = "wait";
+					status = "ok";
+				};
+
+			};
+		};
+	};
+
 	memory {
 		secure_mem: secure_region {
 			linux,contiguous-region;
diff --git a/arch/arm/boot/dts/msm8226/msm8926-v2-sec.dtsi b/arch/arm/boot/dts/msm8226/msm8926-v2-sec.dtsi
index 633c1ab424c..2cea49d493f 100644
--- a/arch/arm/boot/dts/msm8226/msm8926-v2-sec.dtsi
+++ b/arch/arm/boot/dts/msm8226/msm8926-v2-sec.dtsi
@@ -29,6 +29,24 @@
 		uart102 = &uart0;
 	};
 
+	firmware: firmware {
+		android {
+			compatible = "android,firmware";
+			fstab {
+				compatible = "android,fstab";
+				system {
+					compatible = "android,system";
+					dev = "/dev/block/platform/msm_sdcc.1/by-name/system";
+					type = "ext4";
+					mnt_flags = "ro,barrier=1,discard";
+					fsmgr_flags = "wait";
+					status = "ok";
+				};
+
+			};
+		};
+	};
+
 	memory {
 		secure_mem: secure_region {
 			linux,contiguous-region;