.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
1 | 2 | /* |
---|
2 | 3 | * Intel Skylake I2S Machine Driver |
---|
3 | 4 | * |
---|
.. | .. |
---|
7 | 8 | * Intel Broadwell Wildcatpoint SST Audio |
---|
8 | 9 | * |
---|
9 | 10 | * Copyright (C) 2013, Intel Corporation. All rights reserved. |
---|
10 | | - * |
---|
11 | | - * This program is free software; you can redistribute it and/or |
---|
12 | | - * modify it under the terms of the GNU General Public License version |
---|
13 | | - * 2 as published by the Free Software Foundation. |
---|
14 | | - * |
---|
15 | | - * This program is distributed in the hope that it will be useful, |
---|
16 | | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
---|
17 | | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
---|
18 | | - * GNU General Public License for more details. |
---|
19 | 11 | */ |
---|
20 | 12 | |
---|
21 | 13 | #include <linux/module.h> |
---|
.. | .. |
---|
120 | 112 | static int skylake_rt286_fe_init(struct snd_soc_pcm_runtime *rtd) |
---|
121 | 113 | { |
---|
122 | 114 | struct snd_soc_dapm_context *dapm; |
---|
123 | | - struct snd_soc_component *component = rtd->cpu_dai->component; |
---|
| 115 | + struct snd_soc_component *component = asoc_rtd_to_cpu(rtd, 0)->component; |
---|
124 | 116 | |
---|
125 | 117 | dapm = snd_soc_component_get_dapm(component); |
---|
126 | 118 | snd_soc_dapm_ignore_suspend(dapm, "Reference Capture"); |
---|
.. | .. |
---|
130 | 122 | |
---|
131 | 123 | static int skylake_rt286_codec_init(struct snd_soc_pcm_runtime *rtd) |
---|
132 | 124 | { |
---|
133 | | - struct snd_soc_component *component = rtd->codec_dai->component; |
---|
| 125 | + struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; |
---|
134 | 126 | int ret; |
---|
135 | 127 | |
---|
136 | 128 | ret = snd_soc_card_jack_new(rtd->card, "Headset", |
---|
.. | .. |
---|
151 | 143 | static int skylake_hdmi_init(struct snd_soc_pcm_runtime *rtd) |
---|
152 | 144 | { |
---|
153 | 145 | struct skl_rt286_private *ctx = snd_soc_card_get_drvdata(rtd->card); |
---|
154 | | - struct snd_soc_dai *dai = rtd->codec_dai; |
---|
| 146 | + struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); |
---|
155 | 147 | struct skl_hdmi_pcm *pcm; |
---|
156 | 148 | |
---|
157 | 149 | pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); |
---|
.. | .. |
---|
219 | 211 | { |
---|
220 | 212 | struct snd_interval *rate = hw_param_interval(params, |
---|
221 | 213 | SNDRV_PCM_HW_PARAM_RATE); |
---|
222 | | - struct snd_interval *channels = hw_param_interval(params, |
---|
| 214 | + struct snd_interval *chan = hw_param_interval(params, |
---|
223 | 215 | SNDRV_PCM_HW_PARAM_CHANNELS); |
---|
224 | 216 | struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); |
---|
225 | 217 | |
---|
226 | 218 | /* The output is 48KHz, stereo, 16bits */ |
---|
227 | 219 | rate->min = rate->max = 48000; |
---|
228 | | - channels->min = channels->max = 2; |
---|
| 220 | + chan->min = chan->max = 2; |
---|
229 | 221 | |
---|
230 | 222 | /* set SSP0 to 24 bit */ |
---|
231 | 223 | snd_mask_none(fmt); |
---|
.. | .. |
---|
236 | 228 | static int skylake_rt286_hw_params(struct snd_pcm_substream *substream, |
---|
237 | 229 | struct snd_pcm_hw_params *params) |
---|
238 | 230 | { |
---|
239 | | - struct snd_soc_pcm_runtime *rtd = substream->private_data; |
---|
240 | | - struct snd_soc_dai *codec_dai = rtd->codec_dai; |
---|
| 231 | + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); |
---|
| 232 | + struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); |
---|
241 | 233 | int ret; |
---|
242 | 234 | |
---|
243 | 235 | ret = snd_soc_dai_set_sysclk(codec_dai, RT286_SCLK_S_PLL, 24000000, |
---|
.. | .. |
---|
255 | 247 | static int skylake_dmic_fixup(struct snd_soc_pcm_runtime *rtd, |
---|
256 | 248 | struct snd_pcm_hw_params *params) |
---|
257 | 249 | { |
---|
258 | | - struct snd_interval *channels = hw_param_interval(params, |
---|
| 250 | + struct snd_interval *chan = hw_param_interval(params, |
---|
259 | 251 | SNDRV_PCM_HW_PARAM_CHANNELS); |
---|
260 | 252 | if (params_channels(params) == 2) |
---|
261 | | - channels->min = channels->max = 2; |
---|
| 253 | + chan->min = chan->max = 2; |
---|
262 | 254 | else |
---|
263 | | - channels->min = channels->max = 4; |
---|
| 255 | + chan->min = chan->max = 4; |
---|
264 | 256 | |
---|
265 | 257 | return 0; |
---|
266 | 258 | } |
---|
.. | .. |
---|
291 | 283 | .startup = skylake_dmic_startup, |
---|
292 | 284 | }; |
---|
293 | 285 | |
---|
| 286 | +SND_SOC_DAILINK_DEF(dummy, |
---|
| 287 | + DAILINK_COMP_ARRAY(COMP_DUMMY())); |
---|
| 288 | + |
---|
| 289 | +SND_SOC_DAILINK_DEF(system, |
---|
| 290 | + DAILINK_COMP_ARRAY(COMP_CPU("System Pin"))); |
---|
| 291 | + |
---|
| 292 | +SND_SOC_DAILINK_DEF(deepbuffer, |
---|
| 293 | + DAILINK_COMP_ARRAY(COMP_CPU("Deepbuffer Pin"))); |
---|
| 294 | + |
---|
| 295 | +SND_SOC_DAILINK_DEF(reference, |
---|
| 296 | + DAILINK_COMP_ARRAY(COMP_CPU("Reference Pin"))); |
---|
| 297 | + |
---|
| 298 | +SND_SOC_DAILINK_DEF(dmic, |
---|
| 299 | + DAILINK_COMP_ARRAY(COMP_CPU("DMIC Pin"))); |
---|
| 300 | + |
---|
| 301 | +SND_SOC_DAILINK_DEF(hdmi1, |
---|
| 302 | + DAILINK_COMP_ARRAY(COMP_CPU("HDMI1 Pin"))); |
---|
| 303 | + |
---|
| 304 | +SND_SOC_DAILINK_DEF(hdmi2, |
---|
| 305 | + DAILINK_COMP_ARRAY(COMP_CPU("HDMI2 Pin"))); |
---|
| 306 | + |
---|
| 307 | +SND_SOC_DAILINK_DEF(hdmi3, |
---|
| 308 | + DAILINK_COMP_ARRAY(COMP_CPU("HDMI3 Pin"))); |
---|
| 309 | + |
---|
| 310 | +SND_SOC_DAILINK_DEF(ssp0_pin, |
---|
| 311 | + DAILINK_COMP_ARRAY(COMP_CPU("SSP0 Pin"))); |
---|
| 312 | +SND_SOC_DAILINK_DEF(ssp0_codec, |
---|
| 313 | + DAILINK_COMP_ARRAY(COMP_CODEC("i2c-INT343A:00", "rt286-aif1"))); |
---|
| 314 | + |
---|
| 315 | +SND_SOC_DAILINK_DEF(dmic01_pin, |
---|
| 316 | + DAILINK_COMP_ARRAY(COMP_CPU("DMIC01 Pin"))); |
---|
| 317 | +SND_SOC_DAILINK_DEF(dmic_codec, |
---|
| 318 | + DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi"))); |
---|
| 319 | + |
---|
| 320 | +SND_SOC_DAILINK_DEF(idisp1_pin, |
---|
| 321 | + DAILINK_COMP_ARRAY(COMP_CPU("iDisp1 Pin"))); |
---|
| 322 | +SND_SOC_DAILINK_DEF(idisp1_codec, |
---|
| 323 | + DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi1"))); |
---|
| 324 | + |
---|
| 325 | +SND_SOC_DAILINK_DEF(idisp2_pin, |
---|
| 326 | + DAILINK_COMP_ARRAY(COMP_CPU("iDisp2 Pin"))); |
---|
| 327 | +SND_SOC_DAILINK_DEF(idisp2_codec, |
---|
| 328 | + DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi2"))); |
---|
| 329 | + |
---|
| 330 | +SND_SOC_DAILINK_DEF(idisp3_pin, |
---|
| 331 | + DAILINK_COMP_ARRAY(COMP_CPU("iDisp3 Pin"))); |
---|
| 332 | +SND_SOC_DAILINK_DEF(idisp3_codec, |
---|
| 333 | + DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi3"))); |
---|
| 334 | + |
---|
| 335 | +SND_SOC_DAILINK_DEF(platform, |
---|
| 336 | + DAILINK_COMP_ARRAY(COMP_PLATFORM("0000:00:1f.3"))); |
---|
| 337 | + |
---|
294 | 338 | /* skylake digital audio interface glue - connects codec <--> CPU */ |
---|
295 | 339 | static struct snd_soc_dai_link skylake_rt286_dais[] = { |
---|
296 | 340 | /* Front End DAI links */ |
---|
297 | 341 | [SKL_DPCM_AUDIO_PB] = { |
---|
298 | 342 | .name = "Skl Audio Port", |
---|
299 | 343 | .stream_name = "Audio", |
---|
300 | | - .cpu_dai_name = "System Pin", |
---|
301 | | - .platform_name = "0000:00:1f.3", |
---|
302 | 344 | .nonatomic = 1, |
---|
303 | 345 | .dynamic = 1, |
---|
304 | | - .codec_name = "snd-soc-dummy", |
---|
305 | | - .codec_dai_name = "snd-soc-dummy-dai", |
---|
306 | 346 | .init = skylake_rt286_fe_init, |
---|
307 | 347 | .trigger = { |
---|
308 | 348 | SND_SOC_DPCM_TRIGGER_POST, |
---|
.. | .. |
---|
310 | 350 | }, |
---|
311 | 351 | .dpcm_playback = 1, |
---|
312 | 352 | .ops = &skylake_rt286_fe_ops, |
---|
| 353 | + SND_SOC_DAILINK_REG(system, dummy, platform), |
---|
313 | 354 | }, |
---|
314 | 355 | [SKL_DPCM_AUDIO_DB_PB] = { |
---|
315 | 356 | .name = "Skl Deepbuffer Port", |
---|
316 | 357 | .stream_name = "Deep Buffer Audio", |
---|
317 | | - .cpu_dai_name = "Deepbuffer Pin", |
---|
318 | | - .platform_name = "0000:00:1f.3", |
---|
319 | 358 | .nonatomic = 1, |
---|
320 | 359 | .dynamic = 1, |
---|
321 | | - .codec_name = "snd-soc-dummy", |
---|
322 | | - .codec_dai_name = "snd-soc-dummy-dai", |
---|
323 | 360 | .trigger = { |
---|
324 | 361 | SND_SOC_DPCM_TRIGGER_POST, |
---|
325 | 362 | SND_SOC_DPCM_TRIGGER_POST |
---|
326 | 363 | }, |
---|
327 | 364 | .dpcm_playback = 1, |
---|
328 | 365 | .ops = &skylake_rt286_fe_ops, |
---|
329 | | - |
---|
| 366 | + SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), |
---|
330 | 367 | }, |
---|
331 | 368 | [SKL_DPCM_AUDIO_CP] = { |
---|
332 | 369 | .name = "Skl Audio Capture Port", |
---|
333 | 370 | .stream_name = "Audio Record", |
---|
334 | | - .cpu_dai_name = "System Pin", |
---|
335 | | - .platform_name = "0000:00:1f.3", |
---|
336 | 371 | .nonatomic = 1, |
---|
337 | 372 | .dynamic = 1, |
---|
338 | | - .codec_name = "snd-soc-dummy", |
---|
339 | | - .codec_dai_name = "snd-soc-dummy-dai", |
---|
340 | 373 | .trigger = { |
---|
341 | 374 | SND_SOC_DPCM_TRIGGER_POST, |
---|
342 | 375 | SND_SOC_DPCM_TRIGGER_POST |
---|
343 | 376 | }, |
---|
344 | 377 | .dpcm_capture = 1, |
---|
345 | 378 | .ops = &skylake_rt286_fe_ops, |
---|
| 379 | + SND_SOC_DAILINK_REG(system, dummy, platform), |
---|
346 | 380 | }, |
---|
347 | 381 | [SKL_DPCM_AUDIO_REF_CP] = { |
---|
348 | 382 | .name = "Skl Audio Reference cap", |
---|
349 | 383 | .stream_name = "refcap", |
---|
350 | | - .cpu_dai_name = "Reference Pin", |
---|
351 | | - .codec_name = "snd-soc-dummy", |
---|
352 | | - .codec_dai_name = "snd-soc-dummy-dai", |
---|
353 | | - .platform_name = "0000:00:1f.3", |
---|
354 | 384 | .init = NULL, |
---|
355 | 385 | .dpcm_capture = 1, |
---|
356 | 386 | .nonatomic = 1, |
---|
357 | 387 | .dynamic = 1, |
---|
| 388 | + SND_SOC_DAILINK_REG(reference, dummy, platform), |
---|
358 | 389 | }, |
---|
359 | 390 | [SKL_DPCM_AUDIO_DMIC_CP] = { |
---|
360 | 391 | .name = "Skl Audio DMIC cap", |
---|
361 | 392 | .stream_name = "dmiccap", |
---|
362 | | - .cpu_dai_name = "DMIC Pin", |
---|
363 | | - .codec_name = "snd-soc-dummy", |
---|
364 | | - .codec_dai_name = "snd-soc-dummy-dai", |
---|
365 | | - .platform_name = "0000:00:1f.3", |
---|
366 | 393 | .init = NULL, |
---|
367 | 394 | .dpcm_capture = 1, |
---|
368 | 395 | .nonatomic = 1, |
---|
369 | 396 | .dynamic = 1, |
---|
370 | 397 | .ops = &skylake_dmic_ops, |
---|
| 398 | + SND_SOC_DAILINK_REG(dmic, dummy, platform), |
---|
371 | 399 | }, |
---|
372 | 400 | [SKL_DPCM_AUDIO_HDMI1_PB] = { |
---|
373 | 401 | .name = "Skl HDMI Port1", |
---|
374 | 402 | .stream_name = "Hdmi1", |
---|
375 | | - .cpu_dai_name = "HDMI1 Pin", |
---|
376 | | - .codec_name = "snd-soc-dummy", |
---|
377 | | - .codec_dai_name = "snd-soc-dummy-dai", |
---|
378 | | - .platform_name = "0000:00:1f.3", |
---|
379 | 403 | .dpcm_playback = 1, |
---|
380 | 404 | .init = NULL, |
---|
381 | 405 | .nonatomic = 1, |
---|
382 | 406 | .dynamic = 1, |
---|
| 407 | + SND_SOC_DAILINK_REG(hdmi1, dummy, platform), |
---|
383 | 408 | }, |
---|
384 | 409 | [SKL_DPCM_AUDIO_HDMI2_PB] = { |
---|
385 | 410 | .name = "Skl HDMI Port2", |
---|
386 | 411 | .stream_name = "Hdmi2", |
---|
387 | | - .cpu_dai_name = "HDMI2 Pin", |
---|
388 | | - .codec_name = "snd-soc-dummy", |
---|
389 | | - .codec_dai_name = "snd-soc-dummy-dai", |
---|
390 | | - .platform_name = "0000:00:1f.3", |
---|
391 | 412 | .dpcm_playback = 1, |
---|
392 | 413 | .init = NULL, |
---|
393 | 414 | .nonatomic = 1, |
---|
394 | 415 | .dynamic = 1, |
---|
| 416 | + SND_SOC_DAILINK_REG(hdmi2, dummy, platform), |
---|
395 | 417 | }, |
---|
396 | 418 | [SKL_DPCM_AUDIO_HDMI3_PB] = { |
---|
397 | 419 | .name = "Skl HDMI Port3", |
---|
398 | 420 | .stream_name = "Hdmi3", |
---|
399 | | - .cpu_dai_name = "HDMI3 Pin", |
---|
400 | | - .codec_name = "snd-soc-dummy", |
---|
401 | | - .codec_dai_name = "snd-soc-dummy-dai", |
---|
402 | | - .platform_name = "0000:00:1f.3", |
---|
403 | 421 | .dpcm_playback = 1, |
---|
404 | 422 | .init = NULL, |
---|
405 | 423 | .nonatomic = 1, |
---|
406 | 424 | .dynamic = 1, |
---|
| 425 | + SND_SOC_DAILINK_REG(hdmi3, dummy, platform), |
---|
407 | 426 | }, |
---|
408 | 427 | |
---|
409 | 428 | /* Back End DAI links */ |
---|
.. | .. |
---|
411 | 430 | /* SSP0 - Codec */ |
---|
412 | 431 | .name = "SSP0-Codec", |
---|
413 | 432 | .id = 0, |
---|
414 | | - .cpu_dai_name = "SSP0 Pin", |
---|
415 | | - .platform_name = "0000:00:1f.3", |
---|
416 | 433 | .no_pcm = 1, |
---|
417 | | - .codec_name = "i2c-INT343A:00", |
---|
418 | | - .codec_dai_name = "rt286-aif1", |
---|
419 | 434 | .init = skylake_rt286_codec_init, |
---|
420 | 435 | .dai_fmt = SND_SOC_DAIFMT_I2S | |
---|
421 | 436 | SND_SOC_DAIFMT_NB_NF | |
---|
.. | .. |
---|
425 | 440 | .ops = &skylake_rt286_ops, |
---|
426 | 441 | .dpcm_playback = 1, |
---|
427 | 442 | .dpcm_capture = 1, |
---|
| 443 | + SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), |
---|
428 | 444 | }, |
---|
429 | 445 | { |
---|
430 | 446 | .name = "dmic01", |
---|
431 | 447 | .id = 1, |
---|
432 | | - .cpu_dai_name = "DMIC01 Pin", |
---|
433 | | - .codec_name = "dmic-codec", |
---|
434 | | - .codec_dai_name = "dmic-hifi", |
---|
435 | | - .platform_name = "0000:00:1f.3", |
---|
436 | 448 | .be_hw_params_fixup = skylake_dmic_fixup, |
---|
437 | 449 | .ignore_suspend = 1, |
---|
438 | 450 | .dpcm_capture = 1, |
---|
439 | 451 | .no_pcm = 1, |
---|
| 452 | + SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform), |
---|
440 | 453 | }, |
---|
441 | 454 | { |
---|
442 | 455 | .name = "iDisp1", |
---|
443 | 456 | .id = 2, |
---|
444 | | - .cpu_dai_name = "iDisp1 Pin", |
---|
445 | | - .codec_name = "ehdaudio0D2", |
---|
446 | | - .codec_dai_name = "intel-hdmi-hifi1", |
---|
447 | | - .platform_name = "0000:00:1f.3", |
---|
448 | 457 | .init = skylake_hdmi_init, |
---|
449 | 458 | .dpcm_playback = 1, |
---|
450 | 459 | .no_pcm = 1, |
---|
| 460 | + SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), |
---|
451 | 461 | }, |
---|
452 | 462 | { |
---|
453 | 463 | .name = "iDisp2", |
---|
454 | 464 | .id = 3, |
---|
455 | | - .cpu_dai_name = "iDisp2 Pin", |
---|
456 | | - .codec_name = "ehdaudio0D2", |
---|
457 | | - .codec_dai_name = "intel-hdmi-hifi2", |
---|
458 | | - .platform_name = "0000:00:1f.3", |
---|
459 | 465 | .init = skylake_hdmi_init, |
---|
460 | 466 | .dpcm_playback = 1, |
---|
461 | 467 | .no_pcm = 1, |
---|
| 468 | + SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), |
---|
462 | 469 | }, |
---|
463 | 470 | { |
---|
464 | 471 | .name = "iDisp3", |
---|
465 | 472 | .id = 4, |
---|
466 | | - .cpu_dai_name = "iDisp3 Pin", |
---|
467 | | - .codec_name = "ehdaudio0D2", |
---|
468 | | - .codec_dai_name = "intel-hdmi-hifi3", |
---|
469 | | - .platform_name = "0000:00:1f.3", |
---|
470 | 473 | .init = skylake_hdmi_init, |
---|
471 | 474 | .dpcm_playback = 1, |
---|
472 | 475 | .no_pcm = 1, |
---|
| 476 | + SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), |
---|
473 | 477 | }, |
---|
474 | 478 | }; |
---|
475 | 479 | |
---|