111 lines
4.1 KiB
Diff
111 lines
4.1 KiB
Diff
From 5ec30e3d930de9ca7bddbb8ef6b367c0bc89306f Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Thu, 5 Nov 2020 11:39:35 +0000
|
|
Subject: [PATCH] ARM: dts: bcm27xx: Remove enable_headphones setting
|
|
|
|
The enable_headphones parameter of the snd_bcm2835 module is forced
|
|
to 1 if enable_compat_alsa is 0, so setting them both on the kernel
|
|
command line is pointless (and, in the case of Pi 400 and Pi Zeroes,
|
|
confusing).
|
|
|
|
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 +-
|
|
arch/arm/boot/dts/bcm2711-rpi-400.dts | 2 +-
|
|
arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 2 +-
|
|
8 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
|
|
+++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
|
|
@@ -11,7 +11,7 @@
|
|
model = "Raspberry Pi Zero W";
|
|
|
|
chosen {
|
|
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
|
|
+ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=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 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
|
|
+ bootargs = "coherent_pool=1M snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
|
|
};
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/bcm270x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm270x.dtsi
|
|
@@ -3,7 +3,7 @@
|
|
|
|
/ {
|
|
chosen {
|
|
- bootargs = "coherent_pool=1M snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
|
|
+ bootargs = "coherent_pool=1M snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=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
|
|
@@ -12,7 +12,7 @@
|
|
model = "Raspberry Pi 3 Model B+";
|
|
|
|
chosen {
|
|
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
|
|
+ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
|
|
};
|
|
|
|
aliases {
|
|
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
|
|
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
|
|
@@ -12,7 +12,7 @@
|
|
model = "Raspberry Pi 3 Model B";
|
|
|
|
chosen {
|
|
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
|
|
+ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
|
|
};
|
|
|
|
aliases {
|
|
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
|
|
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
|
|
@@ -323,7 +323,7 @@
|
|
|
|
/ {
|
|
chosen {
|
|
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
|
|
+ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
|
|
};
|
|
|
|
aliases {
|
|
--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
|
|
+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
|
|
@@ -322,7 +322,7 @@
|
|
|
|
/ {
|
|
chosen {
|
|
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
|
|
+ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
|
|
};
|
|
|
|
aliases {
|
|
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
|
|
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
|
|
@@ -309,7 +309,7 @@
|
|
|
|
/ {
|
|
chosen {
|
|
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
|
|
+ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
|
|
};
|
|
|
|
aliases {
|