APPLIED: [SRU][I/raspi][PATCH 1/1] ARM: dts: bcm2835_audio missing firmware reference

[Juerg Haefliger]

Applied to impish/raspi master-next branch.

...Juerg


> From: Phil Elwell <phil at raspberrypi.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1957198
> 
> 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 rpi-5.10.y)
> 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";
>  	};

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20220117/5b88a546/attachment-0001.sig>