From 6f880e6cc888b377715c213945530d57a1d6068a Mon Sep 17 00:00:00 2001
From: Wu Liangqing <wlq@rock-chips.com>
Date: Fri, 1 Nov 2019 14:44:13 +0800
Subject: [PATCH] arm: dts: rockchip: rk3126-bnd-m88-emmc for android Q

Change-Id: I0e18cf7d475f113ab198706f4d0568ffc1d154c6
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
---
 arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts | 42 ++++++++++-------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts b/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts
index 427eaba16e72..a6e7df34257b 100644
--- a/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts
+++ b/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts
@@ -114,29 +114,6 @@
 		};
 	};
 
-	firmware {
-		android {
-			compatible = "android,firmware";
-			fstab {
-				compatible = "android,fstab";
-				system {
-					compatible = "android,system";
-					dev = "/dev/block/platform/1021c000.dwmmc/by-name/system";
-					type = "ext4";
-					mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
-					fsmgr_flags = "wait";
-				};
-				vendor {
-					compatible = "android,vendor";
-					dev = "/dev/block/platform/1021c000.dwmmc/by-name/vendor";
-					type = "ext4";
-					mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
-					fsmgr_flags = "wait";
-				};
-			};
-		};
-	};
-
 	uboot-charge {
 		compatible = "rockchip,uboot-charge";
 		rockchip,uboot-charge-on = <0>;
@@ -209,6 +186,25 @@
 	};
 };
 
+&firmware_android {
+	compatible = "android,firmware";
+	boot_devices = "1021c000.dwmmc";
+	vbmeta {
+		compatible = "android,vbmeta";
+		parts = "vbmeta,boot,system,vendor,dtbo";
+	};
+	fstab {
+		compatible = "android,fstab";
+		vendor {
+			compatible = "android,vendor";
+			dev = "/dev/block/by-name/vendor";
+			type = "ext4";
+			mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
+			fsmgr_flags = "wait,avb";
+		};
+	};
+};
+
 &codec {
 	#sound-dai-cells = <0>;
 	spk-ctl-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>;