| From c2b3b61053c2efd8fb96633c214d9f959c25aea3 Mon Sep 17 00:00:00 2001 |
| From: Phil Elwell <phil@raspberrypi.com> |
| Date: Tue, 12 May 2020 08:32:42 +0100 |
| Subject: [PATCH] raspberrypi: dts: Switch to discrete ALSA devices |
| |
| Add the command line options required to enable audio over discrete |
| ALSA devices. |
| |
| Signed-off-by: Phil Elwell <phil@raspberrypi.com> |
| --- |
| arch/arm/boot/dts/bcm2708-rpi-zero-w.dts | 2 +- |
| arch/arm/boot/dts/bcm2708-rpi-zero.dts | 2 +- |
| arch/arm/boot/dts/bcm270x.dtsi | 2 +- |
| arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 2 +- |
| arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 2 +- |
| arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 2 +- |
| 6 files changed, 6 insertions(+), 6 deletions(-) |
| |
| --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts |
| +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts |
| @@ -10,7 +10,7 @@ |
| model = "Raspberry Pi Zero W"; |
| |
| chosen { |
| - bootargs = "coherent_pool=1M 8250.nr_uarts=1"; |
| + bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1"; |
| }; |
| |
| aliases { |
| --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts |
| +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts |
| @@ -10,7 +10,7 @@ |
| model = "Raspberry Pi Zero"; |
| |
| chosen { |
| - bootargs = "coherent_pool=1M"; |
| + bootargs = "coherent_pool=1M snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1"; |
| }; |
| }; |
| |
| --- a/arch/arm/boot/dts/bcm270x.dtsi |
| +++ b/arch/arm/boot/dts/bcm270x.dtsi |
| @@ -3,7 +3,7 @@ |
| |
| / { |
| chosen { |
| - bootargs = "coherent_pool=1M"; |
| + bootargs = "coherent_pool=1M snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1"; |
| /delete-property/ stdout-path; |
| }; |
| |
| --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts |
| +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts |
| @@ -11,7 +11,7 @@ |
| model = "Raspberry Pi 3 Model B+"; |
| |
| chosen { |
| - bootargs = "coherent_pool=1M 8250.nr_uarts=1"; |
| + bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1"; |
| }; |
| |
| aliases { |
| --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts |
| +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts |
| @@ -11,7 +11,7 @@ |
| model = "Raspberry Pi 3 Model B"; |
| |
| chosen { |
| - bootargs = "coherent_pool=1M 8250.nr_uarts=1"; |
| + bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1"; |
| }; |
| |
| aliases { |
| --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts |
| +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts |
| @@ -198,7 +198,7 @@ |
| |
| / { |
| chosen { |
| - bootargs = "coherent_pool=1M 8250.nr_uarts=1"; |
| + bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1"; |
| }; |
| |
| aliases { |