From fd3618748b1ebd0a06aaa8820196d4c49c137b73 Mon Sep 17 00:00:00 2001
From: JinSen Chen <kevin.chen@rock-chips.com>
Date: Thu, 15 Mar 2018 18:47:50 +0800
Subject: [PATCH] ARM: dts: rk3288-android: Add system/vendor partition nodes

Change-Id: Ibb6b1449a11c195a9316583270b82120b17f7cbb
Signed-off-by: JinSen Chen <kevin.chen@rock-chips.com>
---
 arch/arm/boot/dts/rk3288-android.dtsi         | 23 +++++++++++++++++++
 .../boot/dts/rk3288-evb-android-rk818-edp.dts | 23 -------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288-android.dtsi b/arch/arm/boot/dts/rk3288-android.dtsi
index aacddd06dc1c..7ecaf10259d6 100644
--- a/arch/arm/boot/dts/rk3288-android.dtsi
+++ b/arch/arm/boot/dts/rk3288-android.dtsi
@@ -46,6 +46,29 @@
 #include <dt-bindings/display/media-bus-format.h>
 
 / {
+	firmware {
+		android {
+			compatible = "android,firmware";
+			fstab {
+				compatible = "android,fstab";
+				system {
+					compatible = "android,system";
+					dev = "/dev/block/by-name/system";
+					type = "ext4";
+					mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
+					fsmgr_flags = "wait";
+				};
+				vendor {
+					compatible = "android,vendor";
+					dev = "/dev/block/by-name/vendor";
+					type = "ext4";
+					mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
+					fsmgr_flags = "wait";
+				};
+			};
+		};
+	};
+
 	chosen {
 		bootargs = "earlycon=uart8250,mmio32,0xff690000 vmalloc=496M";
 	};
diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts b/arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts
index 009bf6c2ace9..ccf8d6bb15e6 100644
--- a/arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts
+++ b/arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts
@@ -47,29 +47,6 @@
 / {
 	compatible = "rockchip,rk3288-evb-android-rk818", "rockchip,rk3288";
 
-	firmware {
-		android {
-			compatible = "android,firmware";
-			fstab {
-				compatible = "android,fstab";
-				system {
-					compatible = "android,system";
-					dev = "/dev/block/by-name/system";
-					type = "ext4";
-					mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
-					fsmgr_flags = "wait";
-				};
-				vendor {
-					compatible = "android,vendor";
-					dev = "/dev/block/by-name/vendor";
-					type = "ext4";
-					mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
-					fsmgr_flags = "wait";
-				};
-			};
-		};
-	};
-
 	sdio_pwrseq: sdio-pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		clocks = <&rk818 1>;