diff --git a/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro/0001-Default-43455-firmware-to-standard-variant.patch b/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro/0001-Default-43455-firmware-to-standard-variant.patch
deleted file mode 100644
index f67d95b..0000000
--- a/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro/0001-Default-43455-firmware-to-standard-variant.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b9db43e36ad0942d33cb4db5b394abd722862568 Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <andrei.gherzan@huawei.com>
-Date: Fri, 9 Sep 2022 20:28:06 +0200
-Subject: [PATCH] Default 43455 firmware to standard variant
-
-The firmware for 43455 is loaded as a symlink: brcmfmac43455-sdio.bin.
-This symlink is now broken as the debian package handles the right
-target of this symlink through a postinstall. We don't have that logic
-here so we default to the standard variant.
-
-Upstream-Status: Inappropriate [issue reported at https://github.com/RPi-Distro/firmware-nonfree/issues/26]
-Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
----
- debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin
-index 9c39208..b914838 120000
---- a/debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin
-+++ b/debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin
-@@ -1 +1 @@
--../cypress/cyfmac43455-sdio.bin
-\ No newline at end of file
-+../cypress/cyfmac43455-sdio-standard.bin
-\ No newline at end of file
--- 
-2.25.1
-
diff --git a/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb b/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb
index 9ad4143..d9b62c2 100644
--- a/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb
+++ b/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb
@@ -7,7 +7,7 @@ SECTION = "kernel"
 
 LICENSE = "GPL-2.0-only & binary-redist-Cypress-rpidistro & Synaptics-rpidistro"
 LIC_FILES_CHKSUM = "\
-    file://debian/copyright;md5=291ee5385b4cf74b10c5fb5a46a7bbc6 \
+    file://debian/copyright;md5=454e44c688dc909e16223e4aee63568c \
 "
 # Where these are no common licenses, set NO_GENERIC_LICENSE so that the
 # license files will be copied from the fetched source.
@@ -16,11 +16,10 @@ NO_GENERIC_LICENSE[Synaptics-rpidistro] = "debian/copyright"
 LICENSE_FLAGS = "synaptics-killswitch"
 
 SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=bookworm;protocol=https \
-    file://0001-Default-43455-firmware-to-standard-variant.patch \
     file://0002-Default-all-RPi-43455-boards-to-standard-variant.patch \
 "
-SRCREV = "4b356e134e8333d073bd3802d767a825adec3807"
-PV = "20230625-2+rpt3"
+SRCREV = "c9d3ae6584ab79d19a4f94ccf701e888f9f87a53"
+PV = "20240709-2~bpo12+1+rpt3"
 
 inherit allarch
 
@@ -51,6 +50,9 @@ do_install() {
     ln -s cyfmac43455-sdio-${CYFMAC43455_SDIO_FIRMWARE}.bin ${D}${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio.bin
 
     rm ${D}${nonarch_base_libdir}/firmware/cypress/README.txt
+
+    install -d ${D}${sysconfdir}/modprobe.d
+    install -m 0644 debian/rpi-brcmfmac.conf ${D}${sysconfdir}/modprobe.d/
 }
 
 PACKAGES = "\
@@ -61,6 +63,7 @@ PACKAGES = "\
     ${PN}-bcm43455 \
     ${PN}-bcm43456 \
     ${PN}-license \
+    ${PN}-module-conf \
 "
 
 LICENSE:${PN}-bcm43430 = "binary-redist-Cypress-rpidistro"
@@ -91,13 +94,14 @@ FILES:${PN}-bcm43455 = " \
 "
 FILES:${PN}-bcm43456 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43456*"
 FILES:${PN}-license = "${nonarch_base_libdir}/firmware/copyright.firmware-nonfree-rpidistro"
+FILES:${PN}-module-conf = "${sysconfdir}/modprobe.d"
 
-RDEPENDS:${PN}-bcm43430 += "${PN}-license"
-RDEPENDS:${PN}-bcm43436 += "${PN}-license"
-RDEPENDS:${PN}-bcm43436s += "${PN}-license"
-RDEPENDS:${PN}-bcm43439 += "${PN}-license"
-RDEPENDS:${PN}-bcm43455 += "${PN}-license"
-RDEPENDS:${PN}-bcm43456 += "${PN}-license"
+RDEPENDS:${PN}-bcm43430 += "${PN}-license ${PN}-module-conf"
+RDEPENDS:${PN}-bcm43436 += "${PN}-license ${PN}-module-conf"
+RDEPENDS:${PN}-bcm43436s += "${PN}-license ${PN}-module-conf"
+RDEPENDS:${PN}-bcm43439 += "${PN}-license ${PN}-module-conf"
+RDEPENDS:${PN}-bcm43455 += "${PN}-license ${PN}-module-conf"
+RDEPENDS:${PN}-bcm43456 += "${PN}-license ${PN}-module-conf"
 
 RCONFLICTS:${PN}-bcm43430 = "linux-firmware-raspbian-bcm43430"
 RCONFLICTS:${PN}-bcm43436 = "linux-firmware-bcm43436"