hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f
kernel/sound/soc/samsung/bells.c
....@@ -1,13 +1,8 @@
1
-/*
2
- * Bells audio support
3
- *
4
- * Copyright 2012 Wolfson Microelectronics
5
- *
6
- * This program is free software; you can redistribute it and/or modify it
7
- * under the terms of the GNU General Public License as published by the
8
- * Free Software Foundation; either version 2 of the License, or (at your
9
- * option) any later version.
10
- */
1
+// SPDX-License-Identifier: GPL-2.0+
2
+//
3
+// Bells audio support
4
+//
5
+// Copyright 2012 Wolfson Microelectronics
116
127 #include <sound/soc.h>
138 #include <sound/soc-dapm.h>
....@@ -64,8 +59,8 @@
6459 struct bells_drvdata *bells = card->drvdata;
6560 int ret;
6661
67
- rtd = snd_soc_get_pcm_runtime(card, card->dai_link[DAI_DSP_CODEC].name);
68
- codec_dai = rtd->codec_dai;
62
+ rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_DSP_CODEC]);
63
+ codec_dai = asoc_rtd_to_codec(rtd, 0);
6964 component = codec_dai->component;
7065
7166 if (dapm->dev != codec_dai->dev)
....@@ -110,8 +105,8 @@
110105 struct bells_drvdata *bells = card->drvdata;
111106 int ret;
112107
113
- rtd = snd_soc_get_pcm_runtime(card, card->dai_link[DAI_DSP_CODEC].name);
114
- codec_dai = rtd->codec_dai;
108
+ rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_DSP_CODEC]);
109
+ codec_dai = asoc_rtd_to_codec(rtd, 0);
115110 component = codec_dai->component;
116111
117112 if (dapm->dev != codec_dai->dev)
....@@ -156,12 +151,12 @@
156151 struct snd_soc_dai *wm9081_dai;
157152 int ret;
158153
159
- rtd = snd_soc_get_pcm_runtime(card, card->dai_link[DAI_AP_DSP].name);
160
- wm0010 = rtd->codec_dai->component;
154
+ rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_AP_DSP]);
155
+ wm0010 = asoc_rtd_to_codec(rtd, 0)->component;
161156
162
- rtd = snd_soc_get_pcm_runtime(card, card->dai_link[DAI_DSP_CODEC].name);
163
- component = rtd->codec_dai->component;
164
- aif1_dai = rtd->codec_dai;
157
+ rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_DSP_CODEC]);
158
+ component = asoc_rtd_to_codec(rtd, 0)->component;
159
+ aif1_dai = asoc_rtd_to_codec(rtd, 0);
165160
166161 ret = snd_soc_component_set_sysclk(component, ARIZONA_CLK_SYSCLK,
167162 ARIZONA_CLK_SRC_FLL1,
....@@ -199,8 +194,8 @@
199194 return ret;
200195 }
201196
202
- rtd = snd_soc_get_pcm_runtime(card, card->dai_link[DAI_CODEC_CP].name);
203
- aif2_dai = rtd->cpu_dai;
197
+ rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_CODEC_CP]);
198
+ aif2_dai = asoc_rtd_to_cpu(rtd, 0);
204199
205200 ret = snd_soc_dai_set_sysclk(aif2_dai, ARIZONA_CLK_ASYNCCLK, 0, 0);
206201 if (ret != 0) {
....@@ -211,9 +206,9 @@
211206 if (card->num_rtd == DAI_CODEC_SUB)
212207 return 0;
213208
214
- rtd = snd_soc_get_pcm_runtime(card, card->dai_link[DAI_CODEC_SUB].name);
215
- aif3_dai = rtd->cpu_dai;
216
- wm9081_dai = rtd->codec_dai;
209
+ rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_CODEC_SUB]);
210
+ aif3_dai = asoc_rtd_to_cpu(rtd, 0);
211
+ wm9081_dai = asoc_rtd_to_codec(rtd, 0);
217212
218213 ret = snd_soc_dai_set_sysclk(aif3_dai, ARIZONA_CLK_SYSCLK, 0, 0);
219214 if (ret != 0) {
....@@ -247,125 +242,146 @@
247242 .channels_max = 2,
248243 };
249244
245
+SND_SOC_DAILINK_DEFS(wm2200_cpu_dsp,
246
+ DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.0")),
247
+ DAILINK_COMP_ARRAY(COMP_CODEC("spi0.0", "wm0010-sdi1")),
248
+ DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0")));
249
+
250
+SND_SOC_DAILINK_DEFS(wm2200_dsp_codec,
251
+ DAILINK_COMP_ARRAY(COMP_CPU("wm0010-sdi2")),
252
+ DAILINK_COMP_ARRAY(COMP_CODEC("wm2200.1-003a", "wm2200")));
253
+
250254 static struct snd_soc_dai_link bells_dai_wm2200[] = {
251255 {
252256 .name = "CPU-DSP",
253257 .stream_name = "CPU-DSP",
254
- .cpu_dai_name = "samsung-i2s.0",
255
- .codec_dai_name = "wm0010-sdi1",
256
- .platform_name = "samsung-i2s.0",
257
- .codec_name = "spi0.0",
258258 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
259259 | SND_SOC_DAIFMT_CBM_CFM,
260
+ SND_SOC_DAILINK_REG(wm2200_cpu_dsp),
260261 },
261262 {
262263 .name = "DSP-CODEC",
263264 .stream_name = "DSP-CODEC",
264
- .cpu_dai_name = "wm0010-sdi2",
265
- .codec_dai_name = "wm2200",
266
- .codec_name = "wm2200.1-003a",
267265 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
268266 | SND_SOC_DAIFMT_CBM_CFM,
269267 .params = &sub_params,
270268 .ignore_suspend = 1,
269
+ SND_SOC_DAILINK_REG(wm2200_dsp_codec),
271270 },
272271 };
272
+
273
+SND_SOC_DAILINK_DEFS(wm5102_cpu_dsp,
274
+ DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.0")),
275
+ DAILINK_COMP_ARRAY(COMP_CODEC("spi0.0", "wm0010-sdi1")),
276
+ DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0")));
277
+
278
+SND_SOC_DAILINK_DEFS(wm5102_dsp_codec,
279
+ DAILINK_COMP_ARRAY(COMP_CPU("wm0010-sdi2")),
280
+ DAILINK_COMP_ARRAY(COMP_CODEC("wm5102-codec", "wm5102-aif1")));
281
+
282
+SND_SOC_DAILINK_DEFS(wm5102_baseband,
283
+ DAILINK_COMP_ARRAY(COMP_CPU("wm5102-aif2")),
284
+ DAILINK_COMP_ARRAY(COMP_CODEC("wm1250-ev1.1-0027", "wm1250-ev1")));
285
+
286
+SND_SOC_DAILINK_DEFS(wm5102_sub,
287
+ DAILINK_COMP_ARRAY(COMP_CPU("wm5102-aif3")),
288
+ DAILINK_COMP_ARRAY(COMP_CODEC("wm9081.1-006c", "wm9081-hifi")));
273289
274290 static struct snd_soc_dai_link bells_dai_wm5102[] = {
275291 {
276292 .name = "CPU-DSP",
277293 .stream_name = "CPU-DSP",
278
- .cpu_dai_name = "samsung-i2s.0",
279
- .codec_dai_name = "wm0010-sdi1",
280
- .platform_name = "samsung-i2s.0",
281
- .codec_name = "spi0.0",
282294 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
283295 | SND_SOC_DAIFMT_CBM_CFM,
296
+ SND_SOC_DAILINK_REG(wm5102_cpu_dsp),
284297 },
285298 {
286299 .name = "DSP-CODEC",
287300 .stream_name = "DSP-CODEC",
288
- .cpu_dai_name = "wm0010-sdi2",
289
- .codec_dai_name = "wm5102-aif1",
290
- .codec_name = "wm5102-codec",
291301 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
292302 | SND_SOC_DAIFMT_CBM_CFM,
293303 .params = &sub_params,
294304 .ignore_suspend = 1,
305
+ SND_SOC_DAILINK_REG(wm5102_dsp_codec),
295306 },
296307 {
297308 .name = "Baseband",
298309 .stream_name = "Baseband",
299
- .cpu_dai_name = "wm5102-aif2",
300
- .codec_dai_name = "wm1250-ev1",
301
- .codec_name = "wm1250-ev1.1-0027",
302310 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
303311 | SND_SOC_DAIFMT_CBM_CFM,
304312 .ignore_suspend = 1,
305313 .params = &baseband_params,
314
+ SND_SOC_DAILINK_REG(wm5102_baseband),
306315 },
307316 {
308317 .name = "Sub",
309318 .stream_name = "Sub",
310
- .cpu_dai_name = "wm5102-aif3",
311
- .codec_dai_name = "wm9081-hifi",
312
- .codec_name = "wm9081.1-006c",
313319 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
314320 | SND_SOC_DAIFMT_CBS_CFS,
315321 .ignore_suspend = 1,
316322 .params = &sub_params,
323
+ SND_SOC_DAILINK_REG(wm5102_sub),
317324 },
318325 };
326
+
327
+SND_SOC_DAILINK_DEFS(wm5110_cpu_dsp,
328
+ DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.0")),
329
+ DAILINK_COMP_ARRAY(COMP_CODEC("spi0.0", "wm0010-sdi1")),
330
+ DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0")));
331
+
332
+SND_SOC_DAILINK_DEFS(wm5110_dsp_codec,
333
+ DAILINK_COMP_ARRAY(COMP_CPU("wm0010-sdi2")),
334
+ DAILINK_COMP_ARRAY(COMP_CODEC("wm5110-codec", "wm5110-aif1")));
335
+
336
+SND_SOC_DAILINK_DEFS(wm5110_baseband,
337
+ DAILINK_COMP_ARRAY(COMP_CPU("wm5110-aif2")),
338
+ DAILINK_COMP_ARRAY(COMP_CODEC("wm1250-ev1.1-0027", "wm1250-ev1")));
339
+
340
+
341
+SND_SOC_DAILINK_DEFS(wm5110_sub,
342
+ DAILINK_COMP_ARRAY(COMP_CPU("wm5110-aif3")),
343
+ DAILINK_COMP_ARRAY(COMP_CODEC("wm9081.1-006c", "wm9081-hifi")));
319344
320345 static struct snd_soc_dai_link bells_dai_wm5110[] = {
321346 {
322347 .name = "CPU-DSP",
323348 .stream_name = "CPU-DSP",
324
- .cpu_dai_name = "samsung-i2s.0",
325
- .codec_dai_name = "wm0010-sdi1",
326
- .platform_name = "samsung-i2s.0",
327
- .codec_name = "spi0.0",
328349 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
329350 | SND_SOC_DAIFMT_CBM_CFM,
351
+ SND_SOC_DAILINK_REG(wm5110_cpu_dsp),
330352 },
331353 {
332354 .name = "DSP-CODEC",
333355 .stream_name = "DSP-CODEC",
334
- .cpu_dai_name = "wm0010-sdi2",
335
- .codec_dai_name = "wm5110-aif1",
336
- .codec_name = "wm5110-codec",
337356 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
338357 | SND_SOC_DAIFMT_CBM_CFM,
339358 .params = &sub_params,
340359 .ignore_suspend = 1,
360
+ SND_SOC_DAILINK_REG(wm5110_dsp_codec),
341361 },
342362 {
343363 .name = "Baseband",
344364 .stream_name = "Baseband",
345
- .cpu_dai_name = "wm5110-aif2",
346
- .codec_dai_name = "wm1250-ev1",
347
- .codec_name = "wm1250-ev1.1-0027",
348365 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
349366 | SND_SOC_DAIFMT_CBM_CFM,
350367 .ignore_suspend = 1,
351368 .params = &baseband_params,
369
+ SND_SOC_DAILINK_REG(wm5110_baseband),
352370 },
353371 {
354372 .name = "Sub",
355373 .stream_name = "Sub",
356
- .cpu_dai_name = "wm5110-aif3",
357
- .codec_dai_name = "wm9081-hifi",
358
- .codec_name = "wm9081.1-006c",
359374 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
360375 | SND_SOC_DAIFMT_CBS_CFS,
361376 .ignore_suspend = 1,
362377 .params = &sub_params,
378
+ SND_SOC_DAILINK_REG(wm5110_sub),
363379 },
364380 };
365381
366382 static struct snd_soc_codec_conf bells_codec_conf[] = {
367383 {
368
- .dev_name = "wm9081.1-006c",
384
+ .dlc = COMP_CODEC_CONF("wm9081.1-006c"),
369385 .name_prefix = "Sub",
370386 },
371387 };