From 9f607d60071e203689e85c6996d977675819568c Mon Sep 17 00:00:00 2001 From: Christoph Muellner Date: Fri, 28 Jun 2019 15:12:32 +0200 Subject: dts: puma-android: HDMI/vbmeta fixes. * Switch to HDMI to VOPB * Re-enable vbmeta. Signed-off-by: Christoph Muellner --- arch/arm64/boot/dts/rockchip/rk3399-puma-android.dts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'arch/arm64/boot/dts/rockchip') diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-android.dts index 9a217e9b1252..a60b1a9b05e5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-android.dts @@ -852,7 +852,7 @@ }; &hdmi_in_vopl { - status = "okay"; + status = "disabled"; }; &edp_in_vopl { @@ -864,7 +864,7 @@ }; &hdmi_in_vopb { - status = "disabled"; + status = "okay"; }; &edp_in_vopb { @@ -887,18 +887,16 @@ &route_hdmi { status = "okay"; - connect = <&vopl_out_hdmi>; + connect = <&vopb_out_hdmi>; }; &firmware_android { compatible = "android,firmware"; boot_devices = "fe330000.sdhci"; -/* vbmeta { compatible = "android,vbmeta"; parts = "vbmeta,boot,system,vendor,dtbo"; }; -*/ fstab { compatible = "android,fstab"; vendor { @@ -906,7 +904,7 @@ dev = "/dev/block/by-name/vendor"; type = "ext4"; mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; - fsmgr_flags = "wait,avb"; + fsmgr_flags = "wait"; }; }; }; -- cgit v1.2.3