Merge "ARM: dts: msm: Add early mount for vendor and system"

Documentation/devicetree/bindings/arm/msm/android.txt

@@ -1,6 +1,6 @@
 Android firmware
 
-Node to specify early mount of vendor partition.
+Node to specify early mount of vendor and system partition.
 
 Required properties
 
@@ -52,3 +52,35 @@ Example:
 			};
 		};
 	};
+
+system:
+-----------------
+
+system partition specification.
+
+Required properties:
+
+-compatible: "android,system"
+-dev: block device corresponding to system partition
+-type: file system type of system partition
+-mnt_flags: mount flags
+-fsmgr_flags: fsmgr flags
+
+Example:
+
+        firmware: firmware {
+                android {
+                        compatible = "android,firmware";
+                        fstab {
+                                compatible = "android,fstab";
+                                system {
+                                        compatible = "android,system";
+                                        dev = "/dev/block/platform/soc/1da4000.ufshc/by-name/system";
+                                        type = "ext4";
+                                        mnt_flags = "ro,barrier=1,discard";
+                                        fsmgr_flags = "wait,slotselect";
+                                        status = "ok";
+                                };
+                        };
+                };
+        };

Documentation/devicetree/bindings/vendor-prefixes.txt

@@ -21,6 +21,7 @@ amlogic	Amlogic, Inc.
 ampire	Ampire Co., Ltd.
 ams	AMS AG
 amstaos	AMS-Taos Inc.
+android	Google Inc.
 apm	Applied Micro Circuits Corporation (APM)
 aptina	Aptina Imaging
 arasan	Arasan Chip Systems

arch/arm/boot/dts/qcom/msm8996.dtsi

@@ -176,6 +176,31 @@
 
 	soc: soc { };
 
+	firmware: firmware {
+		android {
+			compatible = "android,firmware";
+			fstab {
+				compatible = "android,fstab";
+				vendor {
+					compatible = "android,vendor";
+					dev = "/dev/block/platform/soc/7464900.sdhci/by-name/vendor";
+					type = "ext4";
+					mnt_flags = "ro,barrier=1,discard";
+					fsmgr_flags = "wait,verify";
+					status = "ok";
+				 };
+				 system {
+					compatible = "android,system";
+					dev = "/dev/block/platform/soc/7464900.sdhci/by-name/system";
+					type = "ext4";
+					mnt_flags = "ro,barrier=1,discard";
+					fsmgr_flags = "wait,verify";
+					status = "ok";
+				};
+			};
+		};
+	};
+
 	reserved-memory {
 		#address-cells = <2>;
 		#size-cells = <2>;