From d51cab54d9dae4681a73ba4a224bd7a8f14da7da Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Tue, 12 Mar 2019 18:10:25 +0900 Subject: [PATCH] ODROID-C3/N2: remove unsupported feature 'MEDIA_ENHANCEMENT_DOLBYVISION' Change-Id: I8674837de099f3653d7b101c47cae012273fc8d1 Signed-off-by: Dongjin Kim --- arch/arm64/boot/dts/amlogic/meson64_odroidc3.dts | 7 ------- arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts | 6 ------ arch/arm64/configs/odroidn2_android_defconfig | 2 +- arch/arm64/configs/odroidn2_defconfig | 2 +- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc3.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc3.dts index 03b29ae63a62..707198510717 100644 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidc3.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc3.dts @@ -282,13 +282,6 @@ cm_en = <0>;/*1:enabel ;0:disable*/ }; - amdolby_vision { - compatible = "amlogic, dolby_vision_g12a"; - dev_name = "aml_amdolby_vision_driver"; - status = "okay"; - tv_mode = <0>;/*1:enabel ;0:disable*/ - }; - meson-fb { compatible = "amlogic, meson-g12a"; /*memory-region = <&logo_reserved>;*/ diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts index 56d4d921c50c..ec23b6b750bb 100644 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts @@ -326,12 +326,6 @@ wb_en = <0>;/*1:enabel ;0:disable*/ cm_en = <0>;/*1:enabel ;0:disable*/ }; - amdolby_vision { - compatible = "amlogic, dolby_vision_g12a"; - dev_name = "aml_amdolby_vision_driver"; - status = "okay"; - tv_mode = <0>;/*1:enabel ;0:disable*/ - }; cpu_opp_table0: cpu_opp_table0 { compatible = "operating-points-v2"; diff --git a/arch/arm64/configs/odroidn2_android_defconfig b/arch/arm64/configs/odroidn2_android_defconfig index 7b9a29728035..56ffa7a9b529 100644 --- a/arch/arm64/configs/odroidn2_android_defconfig +++ b/arch/arm64/configs/odroidn2_android_defconfig @@ -1354,7 +1354,7 @@ CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_VECM=y # # Amlogic amdolby_vision Driver # -CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION=y +# CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION is not set CONFIG_AMLOGIC_MEDIA_GDC=y # diff --git a/arch/arm64/configs/odroidn2_defconfig b/arch/arm64/configs/odroidn2_defconfig index 64075d3e60ed..61a4b442e96d 100644 --- a/arch/arm64/configs/odroidn2_defconfig +++ b/arch/arm64/configs/odroidn2_defconfig @@ -1364,7 +1364,7 @@ CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_VECM=y # # Amlogic amdolby_vision Driver # -CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION=y +# CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION is not set CONFIG_AMLOGIC_MEDIA_GDC=y #