[SRU][H/raspi][PATCH 4/5] ARM: dts: bcm2835_audio missing firmware reference

Juerg Haefliger juerg.haefliger at canonical.com
Fri Nov 12 12:04:10 UTC 2021


From: Phil Elwell <phil at raspberrypi.com>

BugLink: https://bugs.launchpad.net/bugs/1950064

The firmware driver has been changed to count its clients. An earlier
commit removed the downstream patch permitting the hacky technique of
passing NULL to rpi_firmware_get to pick up the last instace, but
failed to add the necessary "firmware" property to the bcm2835_audio
node. Correct that omission.

See: https://github.com/raspberrypi/linux/issues/4634
     https://github.com/raspberrypi/linux/issues/4635

Signed-off-by: Phil Elwell <phil at raspberrypi.com>
(cherry picked from commit 214bf6b3eeae500ac13887ce7b2cca576191f38e linux-rpi)
Signed-off-by: Juerg Haefliger <juergh at canonical.com>
---
 arch/arm/boot/dts/bcm270x-rpi.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi
index 68a7e1c09db1..965eafbc383d 100644
--- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
@@ -148,6 +148,7 @@ &vchiq {
 	/* Onboard audio */
 	audio: bcm2835_audio {
 		compatible = "brcm,bcm2835-audio";
+		brcm,firmware = <&firmware>;
 		brcm,pwm-channels = <8>;
 		status = "disabled";
 	};
-- 
2.30.2




More information about the kernel-team mailing list