ASoC: Intel: skl_hda_dsp_generic: add dmic support on hda platform

Add dmic dai links according to the dmic number set in acpi

Signed-off-by: Rander Wang <rander.wang@linux.intel.com>

Author: RanderWang

sound/soc/intel/boards/skl_hda_dsp_common.c

@@ -93,6 +93,28 @@ struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = {
 		.init = NULL,
 		.no_pcm = 1,
 	},
+	{
+		.name = "dmic01",
+		.id = 6,
+		.cpu_dai_name = "DMIC01 Pin",
+		.codec_name = "dmic-codec",
+		.codec_dai_name = "dmic-hifi",
+		.platform_name = "0000:00:1f.3",
+		.dpcm_capture = 1,
+		.init = NULL,
+		.no_pcm = 1,
+	},
+	{
+		.name = "dmic02",
+		.id = 7,
+		.cpu_dai_name = "DMIC16k Pin",
+		.codec_name = "dmic-codec",
+		.codec_dai_name = "dmic-hifi",
+		.platform_name = "0000:00:1f.3",
+		.dpcm_capture = 1,
+		.init = NULL,
+		.no_pcm = 1,
+	},
 };
 
 int skl_hda_hdmi_jack_init(struct snd_soc_card *card)

sound/soc/intel/boards/skl_hda_dsp_common.h

@@ -15,7 +15,7 @@
 #include <sound/core.h>
 #include <sound/jack.h>
 
-#define HDA_DSP_MAX_BE_DAI_LINKS 5
+#define HDA_DSP_MAX_BE_DAI_LINKS 7
 
 struct skl_hda_hdmi_pcm {
 	struct list_head head;

sound/soc/intel/boards/skl_hda_dsp_generic.c

@@ -97,6 +97,9 @@ static struct snd_soc_card hda_soc_card = {
 };
 
 #define IDISP_DAI_COUNT		3
+#define HDAC_DAI_COUNT		2
+#define DMIC_DAI_COUNT		2
+
 /* there are two routes per iDisp output */
 #define IDISP_ROUTE_COUNT	(IDISP_DAI_COUNT * 2)
 #define IDISP_CODEC_MASK	0x4
@@ -114,9 +117,25 @@ static int skl_hda_fill_card_info(struct snd_soc_acpi_mach_params *mach_params)
 	if (codec_count == 1 && codec_mask & IDISP_CODEC_MASK) {
 		num_links = IDISP_DAI_COUNT;
 		num_route = IDISP_ROUTE_COUNT;
+
+			num_links += DMIC_DAI_COUNT;
+
+			/*
+			 * rearrange the dai link array and make the
+			 * dmic dai links follow idsp dai links for only
+			 * num_links of dai links would be registered
+			 * to ASoC.
+			 */
+			for (i = 0; i < DMIC_DAI_COUNT; i++) {
+				skl_hda_be_dai_links[IDISP_DAI_COUNT + i] =
+					skl_hda_be_dai_links[IDISP_DAI_COUNT +
+						HDAC_DAI_COUNT + i];
+		}
 	} else if (codec_count == 2 && codec_mask & IDISP_CODEC_MASK) {
-		num_links = ARRAY_SIZE(skl_hda_be_dai_links);
-		num_route = ARRAY_SIZE(skl_hda_map),
+		num_links = IDISP_DAI_COUNT + HDAC_DAI_COUNT +
+			DMIC_DAI_COUNT;
+		num_route = ARRAY_SIZE(skl_hda_map);
+
 		card->dapm_widgets = skl_hda_widgets;
 		card->num_dapm_widgets = ARRAY_SIZE(skl_hda_widgets);
 	} else {