forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c 
 kernel/sound/soc/intel/boards/kbl_da7219_max98357a.c
....@@ -1,4 +1,4 @@
1
-// SPDX-License-Identifier: GPL-2.0
1
+// SPDX-License-Identifier: GPL-2.0-only
22 // Copyright(c) 2017-18 Intel Corporation.
33 
44 /*
....@@ -19,7 +19,6 @@
1919 #include <sound/soc.h>
2020 #include "../../codecs/da7219.h"
2121 #include "../../codecs/hdac_hdmi.h"
22
-#include "../skylake/skl.h"
2322 #include "../../codecs/da7219-aad.h"
2423 
2524 #define KBL_DIALOG_CODEC_DAI "da7219-hifi"
....@@ -142,13 +141,13 @@
142141 {
143142 	struct snd_interval *rate = hw_param_interval(params,
144143 			SNDRV_PCM_HW_PARAM_RATE);
145
-	struct snd_interval *channels = hw_param_interval(params,
144
+	struct snd_interval *chan = hw_param_interval(params,
146145 			SNDRV_PCM_HW_PARAM_CHANNELS);
147146 	struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
148147 
149148 	/* The ADSP will convert the FE rate to 48k, stereo */
150149 	rate->min = rate->max = 48000;
151
-	channels->min = channels->max = DUAL_CHANNEL;
150
+	chan->min = chan->max = DUAL_CHANNEL;
152151 
153152 	/* set SSP to 24 bit */
154153 	snd_mask_none(fmt);
....@@ -160,8 +159,8 @@
160159 static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd)
161160 {
162161 	struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(rtd->card);
163
-	struct snd_soc_component *component = rtd->codec_dai->component;
164
-	struct snd_soc_dai *codec_dai = rtd->codec_dai;
162
+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
163
+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
165164 	struct snd_soc_jack *jack;
166165 	int ret;
167166 
....@@ -204,7 +203,7 @@
204203 static int kabylake_hdmi_init(struct snd_soc_pcm_runtime *rtd, int device)
205204 {
206205 	struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(rtd->card);
207
-	struct snd_soc_dai *dai = rtd->codec_dai;
206
+	struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0);
208207 	struct kbl_hdmi_pcm *pcm;
209208 
210209 	pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL);
....@@ -237,7 +236,7 @@
237236 static int kabylake_da7219_fe_init(struct snd_soc_pcm_runtime *rtd)
238237 {
239238 	struct snd_soc_dapm_context *dapm;
240
-	struct snd_soc_component *component = rtd->cpu_dai->component;
239
+	struct snd_soc_component *component = asoc_rtd_to_cpu(rtd, 0)->component;
241240 
242241 	dapm = snd_soc_component_get_dapm(component);
243242 	snd_soc_dapm_ignore_suspend(dapm, "Reference Capture");
....@@ -306,7 +305,7 @@
306305 static int kabylake_dmic_fixup(struct snd_soc_pcm_runtime *rtd,
307306 		struct snd_pcm_hw_params *params)
308307 {
309
-	struct snd_interval *channels = hw_param_interval(params,
308
+	struct snd_interval *chan = hw_param_interval(params,
310309 				SNDRV_PCM_HW_PARAM_CHANNELS);
311310 
312311 	/*
....@@ -314,9 +313,9 @@
314313 	 */
315314 
316315 	if (params_channels(params) == 2)
317
-		channels->min = channels->max = 2;
316
+		chan->min = chan->max = 2;
318317 	else
319
-		channels->min = channels->max = 4;
318
+		chan->min = chan->max = 4;
320319 
321320 	return 0;
322321 }
....@@ -337,18 +336,59 @@
337336 	.startup = kabylake_dmic_startup,
338337 };
339338 
340
-static const unsigned int rates_16000[] = {
341
-	16000,
342
-};
339
+SND_SOC_DAILINK_DEF(dummy,
340
+	DAILINK_COMP_ARRAY(COMP_DUMMY()));
343341 
344
-static const struct snd_pcm_hw_constraint_list constraints_16000 = {
345
-	.count = ARRAY_SIZE(rates_16000),
346
-	.list  = rates_16000,
347
-};
342
+SND_SOC_DAILINK_DEF(system,
343
+	DAILINK_COMP_ARRAY(COMP_CPU("System Pin")));
348344 
349
-static const unsigned int ch_mono[] = {
350
-	1,
351
-};
345
+SND_SOC_DAILINK_DEF(dmic,
346
+	DAILINK_COMP_ARRAY(COMP_CPU("DMIC Pin")));
347
+
348
+SND_SOC_DAILINK_DEF(hdmi1,
349
+	DAILINK_COMP_ARRAY(COMP_CPU("HDMI1 Pin")));
350
+
351
+SND_SOC_DAILINK_DEF(hdmi2,
352
+	DAILINK_COMP_ARRAY(COMP_CPU("HDMI2 Pin")));
353
+
354
+SND_SOC_DAILINK_DEF(hdmi3,
355
+	DAILINK_COMP_ARRAY(COMP_CPU("HDMI3 Pin")));
356
+
357
+SND_SOC_DAILINK_DEF(ssp0_pin,
358
+	DAILINK_COMP_ARRAY(COMP_CPU("SSP0 Pin")));
359
+SND_SOC_DAILINK_DEF(ssp0_codec,
360
+	DAILINK_COMP_ARRAY(COMP_CODEC(MAXIM_DEV0_NAME,
361
+				      KBL_MAXIM_CODEC_DAI)));
362
+
363
+SND_SOC_DAILINK_DEF(ssp1_pin,
364
+	DAILINK_COMP_ARRAY(COMP_CPU("SSP1 Pin")));
365
+SND_SOC_DAILINK_DEF(ssp1_codec,
366
+	DAILINK_COMP_ARRAY(COMP_CODEC("i2c-DLGS7219:00",
367
+				      KBL_DIALOG_CODEC_DAI)));
368
+
369
+SND_SOC_DAILINK_DEF(dmic_pin,
370
+	DAILINK_COMP_ARRAY(COMP_CPU("DMIC01 Pin")));
371
+SND_SOC_DAILINK_DEF(dmic_codec,
372
+	DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi")));
373
+
374
+SND_SOC_DAILINK_DEF(idisp1_pin,
375
+	DAILINK_COMP_ARRAY(COMP_CPU("iDisp1 Pin")));
376
+SND_SOC_DAILINK_DEF(idisp1_codec,
377
+	DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2",
378
+				      "intel-hdmi-hifi1")));
379
+
380
+SND_SOC_DAILINK_DEF(idisp2_pin,
381
+	DAILINK_COMP_ARRAY(COMP_CPU("iDisp2 Pin")));
382
+SND_SOC_DAILINK_DEF(idisp2_codec,
383
+	DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi2")));
384
+
385
+SND_SOC_DAILINK_DEF(idisp3_pin,
386
+	DAILINK_COMP_ARRAY(COMP_CPU("iDisp3 Pin")));
387
+SND_SOC_DAILINK_DEF(idisp3_codec,
388
+	DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi3")));
389
+
390
+SND_SOC_DAILINK_DEF(platform,
391
+	DAILINK_COMP_ARRAY(COMP_PLATFORM("0000:00:1f.3")));
352392 
353393 /* kabylake digital audio interface glue - connects codec <--> CPU */
354394 static struct snd_soc_dai_link kabylake_dais[] = {
....@@ -356,86 +396,68 @@
356396 	[KBL_DPCM_AUDIO_PB] = {
357397 		.name = "Kbl Audio Port",
358398 		.stream_name = "Audio",
359
-		.cpu_dai_name = "System Pin",
360
-		.platform_name = "0000:00:1f.3",
361399 		.dynamic = 1,
362
-		.codec_name = "snd-soc-dummy",
363
-		.codec_dai_name = "snd-soc-dummy-dai",
364400 		.nonatomic = 1,
365401 		.init = kabylake_da7219_fe_init,
366402 		.trigger = {
367403 			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
368404 		.dpcm_playback = 1,
369405 		.ops = &kabylake_da7219_fe_ops,
406
+		SND_SOC_DAILINK_REG(system, dummy, platform),
370407 	},
371408 	[KBL_DPCM_AUDIO_CP] = {
372409 		.name = "Kbl Audio Capture Port",
373410 		.stream_name = "Audio Record",
374
-		.cpu_dai_name = "System Pin",
375
-		.platform_name = "0000:00:1f.3",
376411 		.dynamic = 1,
377
-		.codec_name = "snd-soc-dummy",
378
-		.codec_dai_name = "snd-soc-dummy-dai",
379412 		.nonatomic = 1,
380413 		.trigger = {
381414 			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
382415 		.dpcm_capture = 1,
383416 		.ops = &kabylake_da7219_fe_ops,
417
+		SND_SOC_DAILINK_REG(system, dummy, platform),
384418 	},
385419 	[KBL_DPCM_AUDIO_DMIC_CP] = {
386420 		.name = "Kbl Audio DMIC cap",
387421 		.stream_name = "dmiccap",
388
-		.cpu_dai_name = "DMIC Pin",
389
-		.codec_name = "snd-soc-dummy",
390
-		.codec_dai_name = "snd-soc-dummy-dai",
391
-		.platform_name = "0000:00:1f.3",
392422 		.init = NULL,
393423 		.dpcm_capture = 1,
394424 		.nonatomic = 1,
395425 		.dynamic = 1,
396426 		.ops = &kabylake_dmic_ops,
427
+		SND_SOC_DAILINK_REG(dmic, dummy, platform),
397428 	},
398429 	[KBL_DPCM_AUDIO_HDMI1_PB] = {
399430 		.name = "Kbl HDMI Port1",
400431 		.stream_name = "Hdmi1",
401
-		.cpu_dai_name = "HDMI1 Pin",
402
-		.codec_name = "snd-soc-dummy",
403
-		.codec_dai_name = "snd-soc-dummy-dai",
404
-		.platform_name = "0000:00:1f.3",
405432 		.dpcm_playback = 1,
406433 		.init = NULL,
407434 		.trigger = {
408435 			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
409436 		.nonatomic = 1,
410437 		.dynamic = 1,
438
+		SND_SOC_DAILINK_REG(hdmi1, dummy, platform),
411439 	},
412440 	[KBL_DPCM_AUDIO_HDMI2_PB] = {
413441 		.name = "Kbl HDMI Port2",
414442 		.stream_name = "Hdmi2",
415
-		.cpu_dai_name = "HDMI2 Pin",
416
-		.codec_name = "snd-soc-dummy",
417
-		.codec_dai_name = "snd-soc-dummy-dai",
418
-		.platform_name = "0000:00:1f.3",
419443 		.dpcm_playback = 1,
420444 		.init = NULL,
421445 		.trigger = {
422446 			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
423447 		.nonatomic = 1,
424448 		.dynamic = 1,
449
+		SND_SOC_DAILINK_REG(hdmi2, dummy, platform),
425450 	},
426451 	[KBL_DPCM_AUDIO_HDMI3_PB] = {
427452 		.name = "Kbl HDMI Port3",
428453 		.stream_name = "Hdmi3",
429
-		.cpu_dai_name = "HDMI3 Pin",
430
-		.codec_name = "snd-soc-dummy",
431
-		.codec_dai_name = "snd-soc-dummy-dai",
432
-		.platform_name = "0000:00:1f.3",
433454 		.trigger = {
434455 			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
435456 		.dpcm_playback = 1,
436457 		.init = NULL,
437458 		.nonatomic = 1,
438459 		.dynamic = 1,
460
+		SND_SOC_DAILINK_REG(hdmi3, dummy, platform),
439461 	},
440462 
441463 	/* Back End DAI links */
....@@ -443,27 +465,20 @@
443465 		/* SSP0 - Codec */
444466 		.name = "SSP0-Codec",
445467 		.id = 0,
446
-		.cpu_dai_name = "SSP0 Pin",
447
-		.platform_name = "0000:00:1f.3",
448468 		.no_pcm = 1,
449
-		.codec_name = MAXIM_DEV0_NAME,
450
-		.codec_dai_name = KBL_MAXIM_CODEC_DAI,
451469 		.dai_fmt = SND_SOC_DAIFMT_I2S |
452470 			SND_SOC_DAIFMT_NB_NF |
453471 			SND_SOC_DAIFMT_CBS_CFS,
454472 		.ignore_pmdown_time = 1,
455473 		.be_hw_params_fixup = kabylake_ssp_fixup,
456474 		.dpcm_playback = 1,
475
+		SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),
457476 	},
458477 	{
459478 		/* SSP1 - Codec */
460479 		.name = "SSP1-Codec",
461480 		.id = 1,
462
-		.cpu_dai_name = "SSP1 Pin",
463
-		.platform_name = "0000:00:1f.3",
464481 		.no_pcm = 1,
465
-		.codec_name = "i2c-DLGS7219:00",
466
-		.codec_dai_name = KBL_DIALOG_CODEC_DAI,
467482 		.init = kabylake_da7219_codec_init,
468483 		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
469484 			SND_SOC_DAIFMT_CBS_CFS,
....@@ -471,51 +486,40 @@
471486 		.be_hw_params_fixup = kabylake_ssp_fixup,
472487 		.dpcm_playback = 1,
473488 		.dpcm_capture = 1,
489
+		SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),
474490 	},
475491 	{
476492 		.name = "dmic01",
477493 		.id = 2,
478
-		.cpu_dai_name = "DMIC01 Pin",
479
-		.codec_name = "dmic-codec",
480
-		.codec_dai_name = "dmic-hifi",
481
-		.platform_name = "0000:00:1f.3",
482494 		.be_hw_params_fixup = kabylake_dmic_fixup,
483495 		.ignore_suspend = 1,
484496 		.dpcm_capture = 1,
485497 		.no_pcm = 1,
498
+		SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
486499 	},
487500 	{
488501 		.name = "iDisp1",
489502 		.id = 3,
490
-		.cpu_dai_name = "iDisp1 Pin",
491
-		.codec_name = "ehdaudio0D2",
492
-		.codec_dai_name = "intel-hdmi-hifi1",
493
-		.platform_name = "0000:00:1f.3",
494503 		.dpcm_playback = 1,
495504 		.init = kabylake_hdmi1_init,
496505 		.no_pcm = 1,
506
+		SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
497507 	},
498508 	{
499509 		.name = "iDisp2",
500510 		.id = 4,
501
-		.cpu_dai_name = "iDisp2 Pin",
502
-		.codec_name = "ehdaudio0D2",
503
-		.codec_dai_name = "intel-hdmi-hifi2",
504
-		.platform_name = "0000:00:1f.3",
505511 		.init = kabylake_hdmi2_init,
506512 		.dpcm_playback = 1,
507513 		.no_pcm = 1,
514
+		SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
508515 	},
509516 	{
510517 		.name = "iDisp3",
511518 		.id = 5,
512
-		.cpu_dai_name = "iDisp3 Pin",
513
-		.codec_name = "ehdaudio0D2",
514
-		.codec_dai_name = "intel-hdmi-hifi3",
515
-		.platform_name = "0000:00:1f.3",
516519 		.init = kabylake_hdmi3_init,
517520 		.dpcm_playback = 1,
518521 		.no_pcm = 1,
522
+		SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
519523 	},
520524 };
521525 
....@@ -590,7 +594,7 @@
590594 
591595 static const struct platform_device_id kbl_board_ids[] = {
592596 	{
593
-		.name = "kbl_da7219_max98357a",
597
+		.name = "kbl_da7219_mx98357a",
594598 		.driver_data =
595599 			(kernel_ulong_t)&kabylake_audio_card_da7219_m98357a,
596600 	},
....@@ -612,4 +616,4 @@
612616 MODULE_DESCRIPTION("Audio Machine driver-DA7219 & MAX98357A in I2S mode");
613617 MODULE_AUTHOR("Naveen Manohar <naveen.m@intel.com>");
614618 MODULE_LICENSE("GPL v2");
615
-MODULE_ALIAS("platform:kbl_da7219_max98357a");
619
+MODULE_ALIAS("platform:kbl_da7219_mx98357a");