From b77350d9a27657139c303cec4461230c179e9e14 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Tue, 2 Feb 2021 16:30:56 +0900 Subject: [PATCH] arm64: dts: amlogic: VIM3/VIM3L: change display to drm Instead of fbdev, change display to drm. Change-Id: I1c49c92f83ae4c9904116143881839d55cac2634 Signed-off-by: Seung-Woo Kim --- arch/arm64/boot/dts/amlogic/kvim3_linux.dts | 17 ++++++++++++++++- arch/arm64/boot/dts/amlogic/kvim3l_linux.dts | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/kvim3_linux.dts b/arch/arm64/boot/dts/amlogic/kvim3_linux.dts index 6583f3a892e8..89619740076a 100644 --- a/arch/arm64/boot/dts/amlogic/kvim3_linux.dts +++ b/arch/arm64/boot/dts/amlogic/kvim3_linux.dts @@ -20,6 +20,7 @@ #include "mesong12b.dtsi" #include "partition_linux.dtsi" #include "khadas-ts050-panel.dtsi" +#include "mesong12b_drm.dtsi" / { model = "Khadas VIM3"; @@ -876,7 +877,7 @@ }; &meson_fb { - status = "okay"; + status = "disabled"; display_size_default = <1920 1080 1920 2160 32>; mem_size = <0x00800000 0x4b80000 0x100000 0x100000 0x800000>; logo_addr = "0x7f800000"; @@ -885,6 +886,20 @@ 4k2k_fb = <1>; }; +&drm_vpu { + status = "okay"; + logo_addr = "0x7f800000"; +}; + +&drm_amhdmitx { + status = "okay"; + hdcp = "disabled"; +}; + +&drm_lcd { + status = "disabled"; +}; + &pwm_ab { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/kvim3l_linux.dts b/arch/arm64/boot/dts/amlogic/kvim3l_linux.dts index 1c38e44c5e3f..de3e240b57f6 100644 --- a/arch/arm64/boot/dts/amlogic/kvim3l_linux.dts +++ b/arch/arm64/boot/dts/amlogic/kvim3l_linux.dts @@ -20,6 +20,7 @@ #include "mesonsm1.dtsi" #include "partition_linux.dtsi" #include "khadas-ts050-panel.dtsi" +#include "mesong12a_drm.dtsi" / { model = "Khadas VIM3L"; @@ -1070,7 +1071,7 @@ }; /* end of / */ &meson_fb { - status = "okay"; + status = "disabled"; display_size_default = <1920 1080 1920 2160 32>; mem_size = <0x00800000 0x4b80000 0x100000 0x100000 0x800000>; logo_addr = "0x7f800000"; @@ -1079,6 +1080,20 @@ 4k2k_fb = <1>; }; +&drm_vpu { + status = "okay"; + logo_addr = "0x7f800000"; +}; + +&drm_amhdmitx { + status = "okay"; + hdcp = "disabled"; +}; + +&drm_lcd { + status = "disabled"; +}; + &pwm_AO_cd { status = "okay"; }; -- 2.34.1