releases/4.14.60/arm64-dts-renesas-salvator-common-use-audio-graph-card-for-sound.patch

   1 From foo@baz Sat Jul 28 10:25:26 CEST 2018
   2 From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
   3 Date: Mon, 23 Apr 2018 01:40:16 +0000
   4 Subject: arm64: dts: renesas: salvator-common: use audio-graph-card for Sound
   5
   6 From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
   7
   8 [ Upstream commit 06a574c7ef69bd0bd26ed08e35967acb76622ab3 ]
   9
  10 Current Sound is using simple-audio-card which can't support HDMI.
  11 To use HDMI sound, we need to use audio-graph-card.
  12 But, one note is that r8a7795 has 2 HDMI ports, but r8a7796 has 1.
  13 Because of this mismatch, supporting HDMI on salvator-common is
  14 impossible.
  15 Thus, this patch exchange sound card to audio-graph-card and keep
  16 supporting ak4613 as 1st sound node.
  17 r8a7795/r8a7796 salvator-x{s} need to add HDMI sound individually.
  18
  19 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
  20 Tested-by: Nguyen Viet Dung <nv-dung@jinso.co.jp>
  21 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  22 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  23 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  24 ---
  25  arch/arm64/boot/dts/renesas/salvator-common.dtsi |   38 +++++++++++++----------
  26  1 file changed, 22 insertions(+), 16 deletions(-)
  27
  28 --- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi
  29 +++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
  30 @@ -93,20 +93,12 @@
  31                 regulator-always-on;
  32         };
  33
  34 -       rsnd_ak4613: sound {
  35 -               compatible = "simple-audio-card";
  36 +       sound_card: sound {
  37 +               compatible = "audio-graph-card";
  38
  39 -               simple-audio-card,format = "left_j";
  40 -               simple-audio-card,bitclock-master = <&sndcpu>;
  41 -               simple-audio-card,frame-master = <&sndcpu>;
  42 +               label = "rcar-sound";
  43
  44 -               sndcpu: simple-audio-card,cpu {
  45 -                       sound-dai = <&rcar_sound>;
  46 -               };
  47 -
  48 -               sndcodec: simple-audio-card,codec {
  49 -                       sound-dai = <&ak4613>;
  50 -               };
  51 +               dais = <&rsnd_port0>;
  52         };
  53
  54         vbus0_usb2: regulator-vbus0-usb2 {
  55 @@ -320,6 +312,12 @@
  56                 asahi-kasei,out4-single-end;
  57                 asahi-kasei,out5-single-end;
  58                 asahi-kasei,out6-single-end;
  59 +
  60 +               port {
  61 +                       ak4613_endpoint: endpoint {
  62 +                               remote-endpoint = <&rsnd_endpoint0>;
  63 +                       };
  64 +               };
  65         };
  66
  67         cs2000: clk_multiplier@4f {
  68 @@ -538,10 +536,18 @@
  69                  <&audio_clk_c>,
  70                  <&cpg CPG_CORE CPG_AUDIO_CLK_I>;
  71
  72 -       rcar_sound,dai {
  73 -               dai0 {
  74 -                       playback = <&ssi0 &src0 &dvc0>;
  75 -                       capture  = <&ssi1 &src1 &dvc1>;
  76 +       ports {
  77 +               rsnd_port0: port@0 {
  78 +                       rsnd_endpoint0: endpoint {
  79 +                               remote-endpoint = <&ak4613_endpoint>;
  80 +
  81 +                               dai-format = "left_j";
  82 +                               bitclock-master = <&rsnd_endpoint0>;
  83 +                               frame-master = <&rsnd_endpoint0>;
  84 +
  85 +                               playback = <&ssi0 &src0 &dvc0>;
  86 +                               capture  = <&ssi1 &src1 &dvc1>;
  87 +                       };
  88                 };
  89         };
  90  };