From e2a88d8a2aca8b88aacf7fbd25050c94755ac1ea Mon Sep 17 00:00:00 2001 From: Wu Liangqing Date: Fri, 6 Dec 2019 16:18:21 +0800 Subject: [PATCH] arm64: dts: rockchip: remove firmwre_android node Which is not needed for Android 10. Change-Id: Iaa07d61d15b608e1c23fed97b87f31384a75df0a Signed-off-by: Wu Liangqing --- .../dts/rockchip/rk3326-evb-lp3-v10-avb.dts | 19 ------------------- .../dts/rockchip/rk3328-box-liantong-avb.dts | 19 ------------------- .../dts/rockchip/rk3328-evb-android-avb.dts | 19 ------------------- .../rk3399-evb-ind-lpddr4-android-avb.dts | 19 ------------------- .../rk3399-sapphire-excavator-edp-avb.dts | 18 ------------------ 5 files changed, 94 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts index 025bc870daef..9c1e4abd2dbc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts @@ -11,25 +11,6 @@ compatible = "rockchip,rk3326-evb-lp3-v10-avb", "rockchip,rk3326"; }; -&firmware_android { - compatible = "android,firmware"; - boot_devices = "ff390000.dwmmc,ff3b0000.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,avb"; - }; - }; -}; - &rkisp1 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts index 6b3e68bd2805..ee04d8988fbb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts @@ -11,22 +11,3 @@ model = "Rockchip RK3328 box liantong avb"; compatible = "rockchip,rk3328-box-liantong-avb", "rockchip,rk3328"; }; - -&firmware_android{ - compatible = "android,firmware"; - boot_devices = "ff520000.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"; - }; - }; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts index 5e2eb30322f5..0d72e05e2d59 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts @@ -11,22 +11,3 @@ model = "Rockchip RK3328 EVB avb"; compatible = "rockchip,rk3328-evb-avb", "rockchip,rk3328"; }; - -&firmware_android{ - compatible = "android,firmware"; - boot_devices = "ff520000.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"; - }; - }; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts index 8ce11a929ce1..0b4163dd4740 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts @@ -140,25 +140,6 @@ status = "disabled"; }; -&firmware_android { - compatible = "android,firmware"; - boot_devices = "fe330000.sdhci"; - 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"; - }; - }; -}; - &i2c1 { status = "okay"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts index 40e592dd5955..05253b23fcac 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts @@ -14,24 +14,6 @@ }; }; -&firmware_android { - compatible = "android,firmware"; - boot_devices = "fe330000.sdhci"; - 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"; - }; - }; -}; &mipi_dphy_rx0 { status = "okay";