target/linux/bcm27xx/patches-5.4/950-0449-ARM-dts-Move-audio-node-under-the-vchiq-parent.patch

   1 From 6c5efcf09c40d37f72692fdbdf6d461abede20f1 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Mon, 3 Feb 2020 17:03:29 +0000
   4 Subject: [PATCH] ARM: dts: Move audio node under the vchiq parent
   5
   6 VCHIQ kernel clients are now instantiated as platform drivers rather
   7 than using DT, but the children of the vchiq device can optionally be
   8 given a sub-node of the vchiq parent for configuration and to disable
   9 them.
  10
  11 Move the existing audio node beneath the vchiq parent, to prevent
  12 multiple instantiation and unpleasant warnings. Note that the node
  13 name has to match the module name - "bcm2835_audio".
  14
  15 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  16 ---
  17  arch/arm/boot/dts/bcm270x-rpi.dtsi | 16 +++++++++-------
  18  arch/arm/boot/dts/bcm2711-rpi.dtsi | 14 ++++++++++++++
  19  2 files changed, 23 insertions(+), 7 deletions(-)
  20
  21 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
  22 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
  23 @@ -70,13 +70,6 @@
  24                         status = "okay";
  25                 };
  26
  27 -               /* Onboard audio */
  28 -               audio: audio {
  29 -                       compatible = "brcm,bcm2835-audio";
  30 -                       brcm,pwm-channels = <8>;
  31 -                       status = "disabled";
  32 -               };
  33 -
  34                 /* External sound card */
  35                 sound: sound {
  36                         status = "disabled";
  37 @@ -137,3 +130,12 @@
  38  &vec {
  39         status = "disabled";
  40  };
  41 +
  42 +&vchiq {
  43 +       /* Onboard audio */
  44 +       audio: bcm2835_audio {
  45 +               compatible = "brcm,bcm2835-audio";
  46 +               brcm,pwm-channels = <8>;
  47 +               status = "disabled";
  48 +       };
  49 +};
  50 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
  51 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
  52 @@ -55,6 +55,8 @@
  53                 compatible = "brcm,bcm2835-vc4";
  54                 status = "disabled";
  55         };
  56 +
  57 +       /delete-node/ audio;
  58  };
  59
  60  &scb {
  61 @@ -160,6 +162,18 @@
  62         };
  63  };
  64
  65 +&vchiq {
  66 +       /* Onboard audio
  67 +        * This node is replicated because the original from bcm270x-rpi.dtsi
  68 +        * was deleted when the vchiq node was deleted above.
  69 +        */
  70 +       audio: bcm2835_audio {
  71 +               compatible = "brcm,bcm2835-audio";
  72 +               brcm,pwm-channels = <8>;
  73 +               status = "disabled";
  74 +       };
  75 +};
  76 +
  77  &dma {
  78         /* The VPU firmware uses DMA channel 11 for VCHIQ */
  79         brcm,dma-channel-mask = <0x1f5>;