From 93db56dc826bcff5eb75d03d4b51118934314033 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 BugLink: https://bugs.launchpad.net/bugs/1958146 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 (cherry picked from commit ffd529521113069a432cd5bd1b36b62ff814432f rpi-5.15.y) Signed-off-by: Juerg Haefliger --- 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 5a4efdeed6633..62e1d77a8182c 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 4285e12a4e538..76229cad7803e 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",