From a3e576bb9d8e22e1387a3ec2ba0ff9960717ee2f Mon Sep 17 00:00:00 2001 From: Huang zhibao Date: Wed, 1 Feb 2023 15:53:15 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3528-evb: remove firmware node Signed-off-by: Huang zhibao Change-Id: Ie5542723077158e1c17f019bd6a8d46eafe3c1bf --- .../dts/rockchip/rk3528-evb1-ddr4-v10.dts | 23 ------------------ .../dts/rockchip/rk3528-evb2-ddr3-v10.dts | 22 ----------------- .../dts/rockchip/rk3528-evb3-lp4x-v10.dts | 23 ------------------ .../dts/rockchip/rk3528-evb4-ddr4-v10.dts | 24 +++---------------- .../dts/rockchip/rk3528-iotest-lp3-v10.dts | 24 ++----------------- 5 files changed, 5 insertions(+), 111 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3528-evb1-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3528-evb1-ddr4-v10.dts index ea05ddee8e77..b0a531482bcd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3528-evb1-ddr4-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3528-evb1-ddr4-v10.dts @@ -7,29 +7,6 @@ #include "rk3528-evb1-ddr4-v10.dtsi" #include "rk3528-android.dtsi" -/{ - firmware { - android { - compatible = "android,firmware"; - boot_devices = "ffbf0000.mmc"; - 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"; - }; - }; - }; - }; -}; - &sdmmc { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3528-evb2-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3528-evb2-ddr3-v10.dts index d94fbf14ad17..24dbe38c338e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3528-evb2-ddr3-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3528-evb2-ddr3-v10.dts @@ -7,25 +7,3 @@ #include "rk3528-evb2-ddr3-v10.dtsi" #include "rk3528-android.dtsi" -/{ - firmware { - android { - compatible = "android,firmware"; - boot_devices = "ffbf0000.mmc"; - 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/rk3528-evb3-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3528-evb3-lp4x-v10.dts index 8bfbdb5e4db8..07b921886bc8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3528-evb3-lp4x-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3528-evb3-lp4x-v10.dts @@ -7,29 +7,6 @@ #include "rk3528-evb3-lp4x-v10.dtsi" #include "rk3528-android.dtsi" -/{ - firmware { - android { - compatible = "android,firmware"; - boot_devices = "ffbf0000.mmc"; - 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"; - }; - }; - }; - }; -}; - &pdm { status = "okay"; pinctrl-0 = <&pdm_clk1 diff --git a/arch/arm64/boot/dts/rockchip/rk3528-evb4-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3528-evb4-ddr4-v10.dts index ea05ddee8e77..8b5c9e89d90c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3528-evb4-ddr4-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3528-evb4-ddr4-v10.dts @@ -7,27 +7,9 @@ #include "rk3528-evb1-ddr4-v10.dtsi" #include "rk3528-android.dtsi" -/{ - firmware { - android { - compatible = "android,firmware"; - boot_devices = "ffbf0000.mmc"; - 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"; - }; - }; - }; - }; +/ { + model = "Rockchip rk3528 evb4 board"; + compatible = "rockchip,rk3528-evb4-ddr4-v10", "rockchip,rk3528"; }; &sdmmc { diff --git a/arch/arm64/boot/dts/rockchip/rk3528-iotest-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3528-iotest-lp3-v10.dts index 2e6e1f58eaef..62326ae09680 100644 --- a/arch/arm64/boot/dts/rockchip/rk3528-iotest-lp3-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3528-iotest-lp3-v10.dts @@ -10,27 +10,7 @@ #include "rk3528-android.dtsi" / { - model = "Rockchip RK3528 IOTEST LP3 V10 Board"; + model = "Rockchip rk3528 iotest board"; compatible = "rockchip,rk3528-iotest-lp3-v10", "rockchip,rk3528"; - - firmware { - android { - compatible = "android,firmware"; - boot_devices = "ffbf0000.mmc"; - 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"; - }; - }; - }; - }; }; +