Skip to content

Commit ac06cdf

Browse files
committed
ASoC: Intel: skl_hda_dsp_generic: use mach params for card setup
Use mach_params.card_name when provided. Propagate mach_params.dmic_num to ctx->dmic_be_num. Machine data then controls DMIC BE exposure in this card. This enables per-audio-client card setup for split configurations. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent 95a3072 commit ac06cdf

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

sound/soc/intel/boards/skl_hda_dsp_generic.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ static int skl_hda_audio_probe(struct platform_device *pdev)
109109
if (!card)
110110
return -ENOMEM;
111111

112-
card->name = "hda-dsp";
112+
card->name = mach->mach_params.card_name ?
113+
mach->mach_params.card_name : "hda-dsp";
113114
card->owner = THIS_MODULE;
114115
card->fully_routed = true;
115116
card->late_probe = skl_hda_card_late_probe;
@@ -128,6 +129,8 @@ static int skl_hda_audio_probe(struct platform_device *pdev)
128129
if (mach->mach_params.codec_mask & IDISP_CODEC_MASK)
129130
ctx->hdmi.idisp_codec = true;
130131

132+
ctx->dmic_be_num = mach->mach_params.dmic_num;
133+
131134
ctx->link_order_overwrite = HDA_LINK_ORDER;
132135
ctx->link_id_overwrite = HDA_LINK_IDS;
133136

0 commit comments

Comments
 (0)