From 12a6a27872948064248469ff5790b880b0067a15 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mar 04 2024 19:08:20 +0000
Subject: Update to dc94391, rebuild bcm2711 dtbs with a revert that's not upstream linux


---

diff --git a/bcm2711-rpi-4-b.dtb b/bcm2711-rpi-4-b.dtb
new file mode 100644
index 0000000..1f66555
Binary files /dev/null and b/bcm2711-rpi-4-b.dtb differ
diff --git a/bcm2711-rpi-400.dtb b/bcm2711-rpi-400.dtb
new file mode 100644
index 0000000..505f804
Binary files /dev/null and b/bcm2711-rpi-400.dtb differ
diff --git a/bcm2711-rpi-cm4-io.dtb b/bcm2711-rpi-cm4-io.dtb
new file mode 100644
index 0000000..e3eba5f
Binary files /dev/null and b/bcm2711-rpi-cm4-io.dtb differ
diff --git a/bcm2711-rpi-cm4.dtb b/bcm2711-rpi-cm4.dtb
new file mode 100644
index 0000000..081ded3
Binary files /dev/null and b/bcm2711-rpi-cm4.dtb differ
diff --git a/bcm2711-rpi-cm4s.dtb b/bcm2711-rpi-cm4s.dtb
new file mode 100644
index 0000000..7f06e8a
Binary files /dev/null and b/bcm2711-rpi-cm4s.dtb differ
diff --git a/bcm283x-firmware.spec b/bcm283x-firmware.spec
index cc2f8f1..b0c3a87 100644
--- a/bcm283x-firmware.spec
+++ b/bcm283x-firmware.spec
@@ -4,11 +4,11 @@
 # git clone https://github.com/raspberrypi/firmware.git
 # cd firmware/boot
 # tar cJvf ../bcm283x-firmware-%{gitshort}.tar.xz *bin *dat *elf bcm2709*dtb bcm271*dtb LICENCE.broadcom COPYING.linux overlays/
-%define gitshort f01fa5f
+%define gitshort dc94391
 
 Name:          bcm283x-firmware
-Version:       20240214
-Release:       2.%{gitshort}%{?dist}
+Version:       20240229
+Release:       1.%{gitshort}%{?dist}
 Summary:       Firmware for the Broadcom bcm283x/bcm271x used in the Raspberry Pi
 # see LICENSE.broadcom
 # DT Overlays covered under Linux Kernel GPLv2
@@ -27,6 +27,14 @@ Requires:      bcm2711-firmware
 Source0:       %{name}-%{gitshort}.tar.xz
 Source1:       config.txt
 
+# This reverts a FW DT commit that doesn't have the corresponding change in the upstream kernel
+# https://github.com/raspberrypi/linux/commit/0491a0aecb999b1a013ad4a6ad3816c535ac6e73
+Source2:       bcm2711-rpi-400.dtb
+Source3:       bcm2711-rpi-4-b.dtb
+Source4:       bcm2711-rpi-cm4.dtb
+Source5:       bcm2711-rpi-cm4-io.dtb
+Source6:       bcm2711-rpi-cm4s.dtb
+
 %description
 Firmware for the Broadcom bcm283x and bcm2711 series of systems on a chip as
 shipped in the Raspberry Pi series of devices.
@@ -66,11 +74,12 @@ install -p *bin %{buildroot}%{efi_esp_root}
 install -p *dat %{buildroot}%{efi_esp_root}
 install -p *elf %{buildroot}%{efi_esp_root}
 install -p bcm2710*dtb %{buildroot}%{efi_esp_root}
-install -p bcm2711*dtb %{buildroot}%{efi_esp_root}
+# install -p bcm2711*dtb %{buildroot}%{efi_esp_root}
 install -p bcm2712*dtb %{buildroot}%{efi_esp_root}
 install -p overlays/README %{buildroot}%{efi_esp_root}/overlays
 install -p overlays/*.dtbo %{buildroot}%{efi_esp_root}/overlays
 
+install -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{buildroot}%{efi_esp_root}
 
 %files
 # DT Overlays covered under Linux Kernel GPLv2
@@ -95,6 +104,10 @@ install -p overlays/*.dtbo %{buildroot}%{efi_esp_root}/overlays
 %{efi_esp_root}/start4*
 
 %changelog
+* Thu Feb 15 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 20240229-1.dc94391
+- Update to latest firmware
+- Rebuild RPi4 FW DT to fix dma40 sound/display issue
+
 * Thu Feb 15 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 20240214-2.f01fa5f
 - Update to latest firmware
 
diff --git a/sources b/sources
index 365ac0c..0142b9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bcm283x-firmware-f01fa5f.tar.xz) = 2580a998137053e66d334424aa56c4d0951cd79885d6c5a6b2f8d562288632288efb86f6175ad7b6f81a55b1f5604811f2a460bde6121aff8ff335d9ec5b1f99
+SHA512 (bcm283x-firmware-dc94391.tar.xz) = 161bdac0252a604e671ae3c74a27766cd0cd24028246db45c5db3dd08451a28670d1c1eddcbf903437b1c158b24176cb08c2a5765d5e695694ad20505c1f7f63