From 977fe688cb6a63b2b19dc12371b44851bc46ba41 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 25 Oct 2021 11:48:18 +0100 Subject: [PATCH] ARM: dts: vc4-kms-v3d: Always disable firmware HDMI Both the firmware audio driver and the vc4-kms-v3d driver are capable of providing HDMI audio, but only one should be active at any time. The vc4-kms-v3d overlays disable the firmware audio driver, but they also have a noaudio parameter that as well as disabling the ARM-side HDMI audio also re-enables the firmware HDMI audio. This is not guaranteed to work and has been seen to break the display completely. Modify the noaudio parameters so that the firmware HDMI audio support remains disabled. See: https://github.com/raspberrypi/linux/issues/4651 Signed-off-by: Phil Elwell --- arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts | 4 ++-- arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts index 5a4efdeed66336..62e1d77a8182cf 100644 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts @@ -116,8 +116,8 @@ }; __overrides__ { - audio = <0>,"!13", <0>,"=14"; - noaudio = <0>,"=13", <0>,"!14"; + audio = <0>,"!13"; + noaudio = <0>,"=13"; nocomposite = <0>, "!11"; }; }; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts index 4285e12a4e538b..76229cad7803e6 100644 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts @@ -180,7 +180,7 @@ __overrides__ { audio = <0>,"!17"; audio1 = <0>,"!18"; - noaudio = <0>,"=17", <0>,"=18", <0>,"!19"; + noaudio = <0>,"=17", <0>,"=18"; composite = <0>, "!1", <0>, "!2", <0>, "!3",