target/linux/bcm27xx/patches-5.4/950-0719-raspberrypi-dts-Switch-to-discrete-ALSA-devices.patch

   1 From c2b3b61053c2efd8fb96633c214d9f959c25aea3 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Tue, 12 May 2020 08:32:42 +0100
   4 Subject: [PATCH] raspberrypi: dts: Switch to discrete ALSA devices
   5
   6 Add the command line options required to enable audio over discrete
   7 ALSA devices.
   8
   9 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  10 ---
  11  arch/arm/boot/dts/bcm2708-rpi-zero-w.dts   | 2 +-
  12  arch/arm/boot/dts/bcm2708-rpi-zero.dts     | 2 +-
  13  arch/arm/boot/dts/bcm270x.dtsi             | 2 +-
  14  arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 2 +-
  15  arch/arm/boot/dts/bcm2710-rpi-3-b.dts      | 2 +-
  16  arch/arm/boot/dts/bcm2711-rpi-4-b.dts      | 2 +-
  17  6 files changed, 6 insertions(+), 6 deletions(-)
  18
  19 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
  20 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
  21 @@ -10,7 +10,7 @@
  22         model = "Raspberry Pi Zero W";
  23
  24         chosen {
  25 -               bootargs = "coherent_pool=1M 8250.nr_uarts=1";
  26 +               bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
  27         };
  28
  29         aliases {
  30 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
  31 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
  32 @@ -10,7 +10,7 @@
  33         model = "Raspberry Pi Zero";
  34
  35         chosen {
  36 -               bootargs = "coherent_pool=1M";
  37 +               bootargs = "coherent_pool=1M snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
  38         };
  39  };
  40
  41 --- a/arch/arm/boot/dts/bcm270x.dtsi
  42 +++ b/arch/arm/boot/dts/bcm270x.dtsi
  43 @@ -3,7 +3,7 @@
  44
  45  / {
  46         chosen {
  47 -               bootargs = "coherent_pool=1M";
  48 +               bootargs = "coherent_pool=1M snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
  49                 /delete-property/ stdout-path;
  50         };
  51
  52 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
  53 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
  54 @@ -11,7 +11,7 @@
  55         model = "Raspberry Pi 3 Model B+";
  56
  57         chosen {
  58 -               bootargs = "coherent_pool=1M 8250.nr_uarts=1";
  59 +               bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
  60         };
  61
  62         aliases {
  63 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
  64 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
  65 @@ -11,7 +11,7 @@
  66         model = "Raspberry Pi 3 Model B";
  67
  68         chosen {
  69 -               bootargs = "coherent_pool=1M 8250.nr_uarts=1";
  70 +               bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
  71         };
  72
  73         aliases {
  74 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  75 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  76 @@ -198,7 +198,7 @@
  77
  78  / {
  79         chosen {
  80 -               bootargs = "coherent_pool=1M 8250.nr_uarts=1";
  81 +               bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
  82         };
  83
  84         aliases {