meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch

   1 From 274657edb779d77ad0fe5ccb52b51634d075adf8 Mon Sep 17 00:00:00 2001
   2 From: invalid_git config <unknown@unknown>
   3 Date: Wed, 6 Oct 2021 14:42:47 +0000
   4 Subject: [PATCH 2/2] The ADSP on Renesas SoCs required a reserved memory area
   5  to become enabled, and this needs to be done manually.
   6
   7 This patch adds sound hardware abstraction information for the m3ulcb
   8 and m3ulcb-kf (kingfisher) device trees. This is helpful on-board the
   9 ADSP for dynamically determining sound hardware at runtime, allowing
  10 single binaries to be used between the two boards.
  11
  12 Future work will incorporate the h3ulcb and Salvator boards into the
  13 abstraction.
  14
  15 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
  16 Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
  17 ---
  18  arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts | 45 ++++++++++++++++++-
  19  arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts | 45 ++++++++++++++++++-
  20  2 files changed, 88 insertions(+), 2 deletions(-)
  21
  22 diff --git a/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts
  23 index fbc8c9af6e52..df3bd589d9bb 100644
  24 --- a/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts
  25 +++ b/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts
  26 @@ -62,11 +62,18 @@ lossy_decompress: linux,lossy_decompress@54000000 {
  27                         reg = <0x00000000 0x54000000 0x0 0x03000000>;
  28                 };
  29
  30 +               /* For Audio DSP */
  31 +               adsp_reserved: linux,adsp {
  32 +                       compatible = "shared-dma-pool";
  33 +                       reusable;
  34 +                       reg = <0x00000000 0x57000000 0x0 0x01000000>;
  35 +               };
  36 +
  37                 /* global autoconfigured region for contiguous allocations */
  38                 linux,cma@57000000 {
  39                         compatible = "shared-dma-pool";
  40                         reusable;
  41 -                       reg = <0x00000000 0x57000000 0x0 0x19000000>;
  42 +                       reg = <0x00000000 0x58000000 0x0 0x18000000>;
  43                         linux,cma-default;
  44                 };
  45
  46 @@ -126,6 +133,42 @@ &du {
  47                       "dclkin.0", "dclkin.1", "dclkin.2";
  48  };
  49
  50 +&adsp {
  51 +       status = "okay";
  52 +       clock-frequency = <12288000 11289600>;
  53 +       audio-clocks = <22579200 24576000>;
  54 +       memory-region = <&adsp_reserved>;
  55 +
  56 +       /* ADSP playback setting for ak4613 */
  57 +       adsp_playback0: adsp,playback {
  58 +               mode  = "i2s";
  59 +               clock-mode = "master";
  60 +               bus-width = <16>;
  61 +               ssi = <0>;
  62 +               bus-if = <0>;
  63 +               channels = <2>;
  64 +               pin-share-ssi = <1>;
  65 +       };
  66 +
  67 +       /* ADSP capture setting for ak4613 */
  68 +       adsp_capture0: adsp,capture {
  69 +               mode  = "i2s";
  70 +               clock-mode = "slave";
  71 +               bus-width = <16>;
  72 +               ssi = <1>;
  73 +               bus-if = <0>;
  74 +               channels = <2>;
  75 +               pin-share-ssi = <0>;
  76 +       };
  77 +
  78 +       adsp,ports {
  79 +               port@0 {
  80 +                       playback = <&adsp_playback0>;
  81 +                       capture  = <&adsp_capture0>;
  82 +               };
  83 +       };
  84 +};
  85 +
  86  &vspb {
  87         status = "okay";
  88  };
  89 diff --git a/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
  90 index e57dd7bb43f7..f583cc6c18bf 100644
  91 --- a/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
  92 +++ b/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
  93 @@ -41,11 +41,18 @@ lossy_decompress: linux,lossy_decompress@54000000 {
  94                         reg = <0x00000000 0x54000000 0x0 0x03000000>;
  95                 };
  96
  97 +               /* For Audio DSP */
  98 +               adsp_reserved: linux,adsp {
  99 +                       compatible = "shared-dma-pool";
 100 +                       reusable;
 101 +                       reg = <0x00000000 0x57000000 0x0 0x01000000>;
 102 +               };
 103 +
 104                 /* global autoconfigured region for contiguous allocations */
 105                 linux,cma@57000000 {
 106                         compatible = "shared-dma-pool";
 107                         reusable;
 108 -                       reg = <0x00000000 0x57000000 0x0 0x19000000>;
 109 +                       reg = <0x00000000 0x58000000 0x0 0x18000000>;
 110                         linux,cma-default;
 111                 };
 112
 113 @@ -89,6 +96,42 @@ &du {
 114                       "dclkin.0", "dclkin.1", "dclkin.2";
 115  };
 116
 117 +&adsp {
 118 +       status = "okay";
 119 +       clock-frequency = <12288000 11289600>;
 120 +       audio-clocks = <22579200 24576000>;
 121 +       memory-region = <&adsp_reserved>;
 122 +
 123 +       /* ADSP playback setting for ak4613 */
 124 +       adsp_playback0: adsp,playback {
 125 +               mode  = "i2s";
 126 +               clock-mode = "master";
 127 +               bus-width = <16>;
 128 +               ssi = <0>;
 129 +               bus-if = <0>;
 130 +               channels = <2>;
 131 +               pin-share-ssi = <1>;
 132 +       };
 133 +
 134 +       /* ADSP capture setting for ak4613 */
 135 +       adsp_capture0: adsp,capture {
 136 +               mode  = "i2s";
 137 +               clock-mode = "slave";
 138 +               bus-width = <16>;
 139 +               ssi = <1>;
 140 +               bus-if = <0>;
 141 +               channels = <2>;
 142 +               pin-share-ssi = <0>;
 143 +       };
 144 +
 145 +       adsp,ports {
 146 +               port@0 {
 147 +                       playback = <&adsp_playback0>;
 148 +                       capture  = <&adsp_capture0>;
 149 +               };
 150 +       };
 151 +};
 152 +
 153  &vspb {
 154         status = "okay";
 155  };
 156 --
 157 2.31.1
 158