target/linux/bcm27xx/patches-5.10/950-0376-ARM-dts-bcm27xx-Remove-enable_headphones-setting.patch

   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
   5
   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,
   9 confusing).
  10
  11 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  12 ---
  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(-)
  22
  23 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
  24 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
  25 @@ -11,7 +11,7 @@
  26         model = "Raspberry Pi Zero W";
  27
  28         chosen {
  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";
  31         };
  32
  33         aliases {
  34 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
  35 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
  36 @@ -10,7 +10,7 @@
  37         model = "Raspberry Pi Zero";
  38
  39         chosen {
  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";
  42         };
  43  };
  44
  45 --- a/arch/arm/boot/dts/bcm270x.dtsi
  46 +++ b/arch/arm/boot/dts/bcm270x.dtsi
  47 @@ -3,7 +3,7 @@
  48
  49  / {
  50         chosen {
  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;
  54         };
  55
  56 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
  57 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
  58 @@ -12,7 +12,7 @@
  59         model = "Raspberry Pi 3 Model B+";
  60
  61         chosen {
  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";
  64         };
  65
  66         aliases {
  67 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
  68 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
  69 @@ -12,7 +12,7 @@
  70         model = "Raspberry Pi 3 Model B";
  71
  72         chosen {
  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";
  75         };
  76
  77         aliases {
  78 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  79 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  80 @@ -323,7 +323,7 @@
  81
  82  / {
  83         chosen {
  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";
  86         };
  87
  88         aliases {
  89 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
  90 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
  91 @@ -322,7 +322,7 @@
  92
  93  / {
  94         chosen {
  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";
  97         };
  98
  99         aliases {
 100 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 101 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 102 @@ -309,7 +309,7 @@
 103
 104  / {
 105         chosen {
 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";
 108         };
 109
 110         aliases {