API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Oct 28th, 2020
121
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.42 KB | None | 0 0
raw download clone embed print report
  1. From a03135c510d3d3954d6a4cd33a835b9ec2f16c4f Mon Sep 17 00:00:00 2001
  2. From: Jerome Brunet <[email protected]>
  3. Date: Wed, 29 Apr 2020 23:03:52 +0200
  4. Subject: [PATCH] TEST: arm64: dts: vim3: add 8 mics using adau7002 on 40pin
  5.  header
  6.  
  7. Signed-off-by: Jerome Brunet <[email protected]>
  8. ---
  9. .../boot/dts/amlogic/meson-khadas-vim3.dtsi   | 156 +++++++++++++++++-
  10.  1 file changed, 148 insertions(+), 8 deletions(-)
  11.  
  12. diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
  13. index 7b46555ac55a..1d2d745662c2 100644
  14. --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
  15. +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
  16. @@ -15,6 +15,34 @@ aliases {
  17.         ethernet0 = &ethmac;
  18.     };
  19.  
  20. +   mic01: audio-controller-01 {
  21. +          compatible = "adi,adau7002";
  22. +          #sound-dai-cells = <0>;
  23. +          sound-name-prefix = "MIC01";
  24. +          IOVDD-supply = <&vcc_3v3>;
  25. +   };
  26. +
  27. +   mic23: audio-controller-23 {
  28. +          compatible = "adi,adau7002";
  29. +          #sound-dai-cells = <0>;
  30. +          sound-name-prefix = "MIC23";
  31. +          IOVDD-supply = <&vcc_3v3>;
  32. +   };
  33. +
  34. +   mic45: audio-controller-45 {
  35. +          compatible = "adi,adau7002";
  36. +          #sound-dai-cells = <0>;
  37. +          sound-name-prefix = "MIC45";
  38. +          IOVDD-supply = <&vcc_3v3>;
  39. +   };
  40. +
  41. +   mic67: audio-controller-67 {
  42. +          compatible = "adi,adau7002";
  43. +          #sound-dai-cells = <0>;
  44. +          sound-name-prefix = "MIC67";
  45. +          IOVDD-supply = <&vcc_3v3>;
  46. +   };
  47. +
  48.     chosen {
  49.         stdout-path = "serial0:115200n8";
  50.     };
  51. @@ -166,15 +194,45 @@ hdmi_connector_in: endpoint {
  52.     sound {
  53.         compatible = "amlogic,axg-sound-card";
  54.         model = "G12B-KHADAS-VIM3";
  55. -       audio-aux-devs = <&tdmout_a>;
  56. +       audio-widgets = "Microphone", "MIC0",
  57. +                   "Microphone", "MIC1",
  58. +                   "Microphone", "MIC2",
  59. +                   "Microphone", "MIC3",
  60. +                   "Microphone", "MIC4",
  61. +                   "Microphone", "MIC5",
  62. +                   "Microphone", "MIC6",
  63. +                   "Microphone", "MIC7";
  64. +       audio-aux-devs = <&tdmout_a>, <&tdmin_a>,
  65. +                    <&tdmout_b>, <&tdmin_b>;
  66.         audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
  67.                 "TDMOUT_A IN 1", "FRDDR_B OUT 0",
  68.                 "TDMOUT_A IN 2", "FRDDR_C OUT 0",
  69. -               "TDM_A Playback", "TDMOUT_A OUT";
  70. +               "TDM_A Playback", "TDMOUT_A OUT",
  71. +               "TDMOUT_B IN 0", "FRDDR_A OUT 1",
  72. +               "TDMOUT_B IN 1", "FRDDR_B OUT 1",
  73. +               "TDMOUT_B IN 2", "FRDDR_C OUT 1",
  74. +               "TDM_B Playback", "TDMOUT_B OUT",
  75. +               "TDMIN_A IN 1", "TDM_B Capture",
  76. +               "TDMIN_A IN 3", "TDM_A Loopback",
  77. +               "TDMIN_A IN 4", "TDM_B Loopback",
  78. +               "TDMIN_B IN 1", "TDM_B Capture",
  79. +               "TDMIN_B IN 3", "TDM_A Loopback",
  80. +               "TDMIN_B IN 4", "TDM_B Loopback",
  81. +               "TODDR_A IN 0", "TDMIN_A OUT",
  82. +               "TODDR_B IN 0", "TDMIN_A OUT",
  83. +               "TODDR_C IN 0", "TDMIN_A OUT",
  84. +               "TODDR_A IN 1", "TDMIN_B OUT",
  85. +               "TODDR_B IN 1", "TDMIN_B OUT",
  86. +               "TODDR_C IN 1", "TDMIN_B OUT",
  87. +               "MIC01 PDM_DAT", "MIC0",
  88. +               "MIC01 PDM_DAT", "MIC1",
  89. +               "MIC23 PDM_DAT", "MIC2",
  90. +               "MIC23 PDM_DAT", "MIC3",
  91. +               "MIC45 PDM_DAT", "MIC4",
  92. +               "MIC45 PDM_DAT", "MIC5",
  93. +               "MIC67 PDM_DAT", "MIC6",
  94. +               "MIC67 PDM_DAT", "MIC7";
  95.  
  96. -       assigned-clocks = <&clkc CLKID_MPLL2>,
  97. -                 <&clkc CLKID_MPLL0>,
  98. -                 <&clkc CLKID_MPLL1>;
  99.         assigned-clock-parents = <0>, <0>, <0>;
  100.         assigned-clock-rates = <294912000>,
  101.                        <270950400>,
  102. @@ -193,8 +251,20 @@ dai-link-2 {
  103.             sound-dai = <&frddr_c>;
  104.         };
  105.  
  106. -       /* 8ch hdmi interface */
  107.         dai-link-3 {
  108. +           sound-dai = <&toddr_a>;
  109. +       };
  110. +
  111. +       dai-link-4 {
  112. +           sound-dai = <&toddr_b>;
  113. +       };
  114. +
  115. +       dai-link-5 {
  116. +           sound-dai = <&toddr_c>;
  117. +       };
  118. +
  119. +       /* 8ch hdmi interface */
  120. +       dai-link-6 {
  121.             sound-dai = <&tdmif_a>;
  122.             dai-format = "i2s";
  123.             dai-tdm-slot-tx-mask-0 = <1 1>;
  124. @@ -208,8 +278,39 @@ codec {
  125.             };
  126.         };
  127.  
  128. +       /* 40pin header */
  129. +       dai-link-7 {
  130. +           sound-dai = <&tdmif_b>;
  131. +           dai-format = "dsp_a";
  132. +           dai-tdm-slot-num = <8>;
  133. +           dai-tdm-slot-width = <32>;
  134. +           dai-tdm-slot-tx-mask-0 = <1 1>;
  135. +           dai-tdm-slot-rx-mask-1 = <1 1 1 1 1 1 1 1>;
  136. +           mclk-fs = <512>;
  137. +
  138. +           codec-0 {
  139. +               sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
  140. +           };
  141. +
  142. +           codec-1 {
  143. +               sound-dai = <&mic01>;
  144. +           };
  145. +
  146. +           codec-2 {
  147. +               sound-dai = <&mic23>;
  148. +           };
  149. +
  150. +           codec-3 {
  151. +               sound-dai = <&mic45>;
  152. +           };
  153. +
  154. +           codec-4 {
  155. +               sound-dai = <&mic67>;
  156. +           };
  157. +       };
  158. +
  159.         /* hdmi glue */
  160. -       dai-link-4 {
  161. +       dai-link-8 {
  162.             sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
  163.  
  164.             codec {
  165. @@ -445,15 +546,54 @@ w25q128: spi-flash@0 {
  166.     };
  167.  };
  168.  
  169. -
  170.  &tdmif_a {
  171.     status = "okay";
  172.  };
  173.  
  174. +&tdmif_b {
  175. +   status = "okay";
  176. +   pinctrl-0 = <&mclk0_a_pins>,
  177. +           <&tdm_b_sclk_pins>, <&tdm_b_fs_pins>,
  178. +           <&tdm_b_dout0_pins>, <&tdm_b_din1_pins>;
  179. +   pinctrl-names = "default";
  180. +
  181. +   assigned-clocks = <&clkc_audio AUD_CLKID_TDM_SCLK_PAD1>,
  182. +             <&clkc_audio AUD_CLKID_TDM_LRCLK_PAD1>,
  183. +             <&clkc_audio AUD_CLKID_TDM_MCLK_PAD0>;
  184. +   assigned-clock-parents = <&clkc_audio AUD_CLKID_MST_B_SCLK>,
  185. +                <&clkc_audio AUD_CLKID_MST_B_LRCLK>,
  186. +                <&clkc_audio AUD_CLKID_MST_B_MCLK>;
  187. +   assigned-clock-rates = <0>, <0>, <0>;
  188. +};
  189. +
  190. +&tdmin_a {
  191. +   status = "okay";
  192. +};
  193. +
  194. +&tdmin_b {
  195. +   status = "okay";
  196. +};
  197. +
  198.  &tdmout_a {
  199.     status = "okay";
  200.  };
  201.  
  202. +&tdmout_b {
  203. +   status = "okay";
  204. +};
  205. +
  206. +&toddr_a {
  207. +   status = "okay";
  208. +};
  209. +
  210. +&toddr_b {
  211. +   status = "okay";
  212. +};
  213. +
  214. +&toddr_c {
  215. +   status = "okay";
  216. +};
  217. +
  218.  &tohdmitx {
  219.     status = "okay";
  220.  };
  221. --
  222. 2.26.2
  223.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!