1 From 5ec30e3d930de9ca7bddbb8ef6b367c0bc89306f Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Thu, 5 Nov 2020 11:39:35 +0000
4 Subject: [PATCH] ARM: dts: bcm27xx: Remove enable_headphones setting
6 The enable_headphones parameter of the snd_bcm2835 module is forced
7 to 1 if enable_compat_alsa is 0, so setting them both on the kernel
8 command line is pointless (and, in the case of Pi 400 and Pi Zeroes,
11 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
13 arch/arm/boot/dts/bcm2708-rpi-zero-w.dts | 2 +-
14 arch/arm/boot/dts/bcm2708-rpi-zero.dts | 2 +-
15 arch/arm/boot/dts/bcm270x.dtsi | 2 +-
16 arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 2 +-
17 arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 2 +-
18 arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 2 +-
19 arch/arm/boot/dts/bcm2711-rpi-400.dts | 2 +-
20 arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 2 +-
21 8 files changed, 8 insertions(+), 8 deletions(-)
23 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
24 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
26 model = "Raspberry Pi Zero W";
29 - bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
30 + bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
34 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
35 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
37 model = "Raspberry Pi Zero";
40 - bootargs = "coherent_pool=1M snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
41 + bootargs = "coherent_pool=1M snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
45 --- a/arch/arm/boot/dts/bcm270x.dtsi
46 +++ b/arch/arm/boot/dts/bcm270x.dtsi
51 - bootargs = "coherent_pool=1M snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
52 + bootargs = "coherent_pool=1M snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
53 /delete-property/ stdout-path;
56 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
57 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
59 model = "Raspberry Pi 3 Model B+";
62 - bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
63 + bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
67 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
68 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
70 model = "Raspberry Pi 3 Model B";
73 - bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
74 + bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
78 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
79 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
84 - bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
85 + bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
89 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
90 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
95 - bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
96 + bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
100 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
101 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
106 - bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
107 + bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";