From f7a7190141466db4e40417b594c195d0fa418446 Mon Sep 17 00:00:00 2001
From: Arthur Shuai <shuaiq@codeaurora.org>
Date: Sat, 26 Jan 2019 16:33:38 +0800
Subject: [PATCH 1/2] ARM64: dts: sm8150: update firmware config

Add odm relate type mnt_flags and fsmgr_flags.

Change-Id: Id5d6b8afc483687425ece22fc021dd849f9271a3
Signed-off-by: Arthur Shuai <shuaiq@codeaurora.org>
---
 .../devicetree/bindings/arm/msm/android.txt   | 32 +++++++++++++++++++
 arch/arm64/boot/dts/qcom/sm8150.dtsi          |  8 +++++
 2 files changed, 40 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/msm/android.txt b/Documentation/devicetree/bindings/arm/msm/android.txt
index 7b8b7909bae3..32e418fd01fb 100644
--- a/Documentation/devicetree/bindings/arm/msm/android.txt
+++ b/Documentation/devicetree/bindings/arm/msm/android.txt
@@ -53,6 +53,38 @@ Example:
 		};
 	};
 
+odm:
+-----------------
+
+odm partition specification.
+
+Required properties:
+
+-compatible: "android, odm"
+-dev: block device corresponding to odm partition
+-type: file system type of odm partition
+-mnt_flags: mount flags
+-fsmgr_flags: fsmgr flags
+
+Example:
+
+       firmware: firmware {
+               android {
+                       compatible = "android,firmware";
+                       fstab {
+                               compatible = "android,fstab";
+                               odm {
+                                       compatible = "android,odm";
+                                       dev = "/dev/block/platform/soc/1da4000.ufshc/by-name/odm";
+                                       type = "ext4";
+                                       mnt_flags = "ro,barrier=1,discard";
+                                       fsmgr_flags = "wait,slotselect";
+                                       status = "ok";
+                               };
+                       };
+               };
+       };
+
 system:
 -----------------
 
diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index 35df47bde9f3..9293e0469367 100644
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -586,6 +586,14 @@
 					fsmgr_flags = "wait,slotselect,avb";
 					status = "ok";
 				};
+				odm {
+					compatible = "android,odm";
+					dev = "/dev/block/platform/soc/8804000.sdhci/by-name/odm";
+					type = "ext4";
+					mnt_flags = "ro,barrier=1,discard";
+					fsmgr_flags = "wait,slotselect";
+					status = "ok";
+				};
 			};
 		};
 	};

From bfc57a82986bce2e0e93999a2a2b2c600c33dd9b Mon Sep 17 00:00:00 2001
From: Arthur Shuai <shuaiq@codeaurora.org>
Date: Fri, 1 Mar 2019 18:15:30 +0800
Subject: [PATCH 2/2] ARM: dts: msm: Add odm partition for sm8150

Add odm partition and enable verified boot.
Update partition and fsmgr_flags.

Change-Id: Ie0e69b13b35a624aa45791ccc77de52c67c2ba85
Signed-off-by: Arthur Shuai <shuaiq@codeaurora.org>
---
 arch/arm64/boot/dts/qcom/sm8150.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index 9293e0469367..814d7d854cd0 100644
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -574,7 +574,7 @@
 			compatible = "android,firmware";
 			vbmeta {
 				compatible = "android,vbmeta";
-				parts = "vbmeta,boot,system,vendor,dtbo";
+				parts = "vbmeta,boot,system,vendor,dtbo,odm";
 			};
 			fstab {
 				compatible = "android,fstab";
@@ -591,7 +591,7 @@
 					dev = "/dev/block/platform/soc/8804000.sdhci/by-name/odm";
 					type = "ext4";
 					mnt_flags = "ro,barrier=1,discard";
-					fsmgr_flags = "wait,slotselect";
+					fsmgr_flags = "wait,slotselect,avb";
 					status = "ok";
 				};
 			};