target/linux/bcm27xx/patches-5.15/950-0544-ARM-dts-vc4-kms-v3d-Always-disable-firmware-HDMI.patch

   1 From 3942525ae16ac52fe8b632a3d3fb34af9f0d5c5e Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Mon, 25 Oct 2021 11:48:18 +0100
   4 Subject: [PATCH] ARM: dts: vc4-kms-v3d: Always disable firmware HDMI
   5
   6 Both the firmware audio driver and the vc4-kms-v3d driver are capable
   7 of providing HDMI audio, but only one should be active at any time.
   8 The vc4-kms-v3d overlays disable the firmware audio driver, but they
   9 also have a noaudio parameter that as well as disabling the ARM-side
  10 HDMI audio also re-enables the firmware HDMI audio. This is not
  11 guaranteed to work and has been seen to break the display completely.
  12
  13 Modify the noaudio parameters so that the firmware HDMI audio support
  14 remains disabled.
  15
  16 See: https://github.com/raspberrypi/linux/issues/4651
  17
  18 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  19 ---
  20  arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts     | 4 ++--
  21  arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts | 2 +-
  22  2 files changed, 3 insertions(+), 3 deletions(-)
  23
  24 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
  25 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
  26 @@ -116,8 +116,8 @@
  27         };
  28
  29         __overrides__ {
  30 -               audio   = <0>,"!13", <0>,"=14";
  31 -               noaudio = <0>,"=13", <0>,"!14";
  32 +               audio   = <0>,"!13";
  33 +               noaudio = <0>,"=13";
  34                 nocomposite = <0>, "!11";
  35         };
  36  };
  37 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
  38 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
  39 @@ -180,7 +180,7 @@
  40         __overrides__ {
  41                 audio   = <0>,"!17";
  42                 audio1   = <0>,"!18";
  43 -               noaudio = <0>,"=17", <0>,"=18", <0>,"!19";
  44 +               noaudio = <0>,"=17", <0>,"=18";
  45                 composite = <0>, "!1",
  46                             <0>, "!2",
  47                             <0>, "!3",