diff mbox series

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

Message ID 20220117081231.104490-2-juergh@canonical.com
State New
Headers show
Series HDMI audio no longer working on Pi4 after 5.13.0-1011 (LP: #1957198) | expand

Commit Message

Juerg Haefliger Jan. 17, 2022, 8:12 a.m. UTC 
From: Phil Elwell <phil@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@raspberrypi.com>

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

Comments

Stefan Bader Jan. 17, 2022, 10:30 a.m. UTC | #1 
On 17.01.22 09:12, Juerg Haefliger wrote:
> From: Phil Elwell <phil@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@raspberrypi.com>
> 
> (cherry picked from commit 214bf6b3eeae500ac13887ce7b2cca576191f38e rpi-5.10.y)
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>
Acked-by: Stefan Bader <stefan.bader@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";
>   	};
>
Krzysztof Kozlowski Jan. 17, 2022, 10:32 a.m. UTC | #2 
On 17/01/2022 09:12, Juerg Haefliger wrote:
> From: Phil Elwell <phil@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@raspberrypi.com>
> 
> (cherry picked from commit 214bf6b3eeae500ac13887ce7b2cca576191f38e rpi-5.10.y)
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>
> ---
>  arch/arm/boot/dts/bcm270x-rpi.dtsi | 1 +
>  1 file changed, 1 insertion(+)
> 


Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>


Best regards,
Krzysztof
Juerg Haefliger Jan. 17, 2022, 11:43 a.m. UTC | #3 
Applied to impish/raspi master-next branch.

...Juerg


> From: Phil Elwell <phil@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@raspberrypi.com>
> 
> (cherry picked from commit 214bf6b3eeae500ac13887ce7b2cca576191f38e rpi-5.10.y)
> Signed-off-by: Juerg Haefliger <juergh@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";
>  	};
diff mbox series

Patch

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";
 	};