From c5df83df75c6acfb43b62c1968653f4cd29dc06a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 16 Jul 2024 02:16:53 +0300
Subject: [PATCH] nix/configuration-cm3: fix HDMI hot plug detection

The upstream .dts file has the wrong GPIO pin configured for hotplug, so
the kernel assumes no display is connected.

Sent upstream in http://lists.infradead.org/pipermail/linux-arm-kernel/2024-July/943386.html
---
 nix/configuration-cm3.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/nix/configuration-cm3.nix b/nix/configuration-cm3.nix
index b917182..6f46eba 100644
--- a/nix/configuration-cm3.nix
+++ b/nix/configuration-cm3.nix
@@ -28,4 +28,22 @@ in
   # u-boot doesn't know the proper device tree name, so cannot pick from FTDIR
   # on its own.
   hardware.deviceTree.name = "broadcom/bcm2837-rpi-cm3-io3.dtb";
+  hardware.deviceTree.overlays = [
+    {
+      # http://lists.infradead.org/pipermail/linux-arm-kernel/2024-July/943386.html
+      name = "fix-hdmi-hpd-gpio-port";
+      dtsText = ''
+        /dts-v1/;
+        /plugin/;
+        / {
+          compatible = "raspberrypi,3-compute-module", "brcm,bcm2837";
+        };
+        &{/soc} {
+          hdmi {
+            hpd-gpios = <&expgpio 0 1>;
+          };
+        };
+      '';
+    }
+  ];
 }