Skip to content

Commit 834e36f

Browse files
committed
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: #4651 Signed-off-by: Phil Elwell <[email protected]>
1 parent 5b7beea commit 834e36f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@
116116
};
117117

118118
__overrides__ {
119-
audio = <0>,"!13", <0>,"=14";
120-
noaudio = <0>,"=13", <0>,"!14";
119+
audio = <0>,"!13";
120+
noaudio = <0>,"=13";
121121
nocomposite = <0>, "!11";
122122
};
123123
};

arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
__overrides__ {
181181
audio = <0>,"!17";
182182
audio1 = <0>,"!18";
183-
noaudio = <0>,"=17", <0>,"=18", <0>,"!19";
183+
noaudio = <0>,"=17", <0>,"=18";
184184
composite = <0>, "!1",
185185
<0>, "!2",
186186
<0>, "!3",

0 commit comments

Comments
 (0)