From 7ec17eafded3747169370e17f669f7b56c98d05a Mon Sep 17 00:00:00 2001 From: Wu Liangqing Date: Fri, 6 Dec 2019 16:18:21 +0800 Subject: [PATCH] ARM: dts: rockchip: remove firmwre_android node Which is not needed for Android 10. Change-Id: Ibcbc2afb1f7d216821e70bd5a0ff66c78ee5f39c Signed-off-by: Wu Liangqing --- arch/arm/boot/dts/rk3126-bnd-d708-avb.dts | 18 ------------------ arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts | 19 ------------------- 2 files changed, 37 deletions(-) diff --git a/arch/arm/boot/dts/rk3126-bnd-d708-avb.dts b/arch/arm/boot/dts/rk3126-bnd-d708-avb.dts index c207c9df28dc..ea5e0d11e40c 100644 --- a/arch/arm/boot/dts/rk3126-bnd-d708-avb.dts +++ b/arch/arm/boot/dts/rk3126-bnd-d708-avb.dts @@ -11,21 +11,3 @@ compatible = "rockchip,rk3126"; }; -&firmware_android { - compatible = "android,firmware"; - boot_devices = "10500000.nandc"; - 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"; - }; - }; -}; diff --git a/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts b/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts index 102df021f653..80c9c6ba7d5e 100644 --- a/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts +++ b/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts @@ -188,25 +188,6 @@ }; }; -&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>;