Add: multi codec support in simple-card

Author: turmary

ac101.c

@@ -1319,7 +1319,6 @@ static int ac10x_hw_params(struct snd_pcm_substream *substream,
 		break;
 	}
 
-
 	/* set LRCK/BCLK ratio */
 	aif1_lrck_div = aif1_slot_size * channels;
 	for (i = 0; i < ARRAY_SIZE(codec_aif1_lrck); i++) {
@@ -1332,7 +1331,7 @@ static int ac10x_hw_params(struct snd_pcm_substream *substream,
 	/* set PLL output freq */
 	freq_out = 24576000;
 	for (i = 0; i < ARRAY_SIZE(codec_aif1_fs); i++) {
-		if (codec_aif1_fs[i].samp_rate ==  params_rate(params)) {
+		if (codec_aif1_fs[i].samp_rate == params_rate(params)) {
 			if (codec_dai->capture_active && dmic_used && codec_aif1_fs[i].samp_rate == 44100) {
 				snd_soc_update_bits(codec, AIF_SR_CTRL, (0xf<<AIF1_FS), (0x4<<AIF1_FS));
 			} else {
@@ -1372,6 +1371,9 @@ static int ac10x_hw_params(struct snd_pcm_substream *substream,
 		snd_soc_update_bits(codec, AIF_CLK_CTRL, (0xf<<AIF1_BCLK_DIV), i<<AIF1_BCLK_DIV);
 	}
 
+	AC10X_DBG("rate: %d , channels: %d , samp_res: %d",
+		params_rate(params), channels, aif1_slot_size);
+
 	AC10X_DBG("%s() L%d ---\n", __func__, __LINE__);
 	return 0;
 }
@@ -1632,15 +1634,15 @@ static struct snd_soc_dai_driver ac10x_dai[] = {
 		.name = "ac10x-aif1",
 		.id = AIF1_CLK,
 		.playback = {
-			.stream_name = "AIF1 Playback",
+			.stream_name = "Playback",
 			.channels_min = 1,
 			.channels_max = 8,
 			.rates = ac10x_RATES,
 			.formats = ac10x_FORMATS,
 		},
 		#if 0
 		.capture = {
-			.stream_name = "AIF1 Capture",
+			.stream_name = "Capture",
 			.channels_min = 1,
 			.channels_max = 8,
 			.rates = ac10x_RATES,

ac108.c

@@ -823,7 +823,8 @@ static int ac108_configure_clocking(struct ac108_priv *ac108, unsigned int rate)
 		for (i = 0; i < ARRAY_SIZE(ac108_pll_div_list); i++) {
 			if (ac108_pll_div_list[i].freq_in == ac108->sysclk && ac108_pll_div_list[i].freq_out % rate == 0) {
 				ac108_pll_div = ac108_pll_div_list[i];
-				pr_err("AC108 PLL freq_in match:%u, freq_out:%u\n\n", ac108_pll_div.freq_in, ac108_pll_div.freq_out);
+				dev_dbg(&ac108->i2c[_MASTER_INDEX]->dev, "AC108 PLL freq_in match:%u, freq_out:%u\n\n",
+								ac108_pll_div.freq_in, ac108_pll_div.freq_out);
 				break;
 			}
 		}
@@ -973,7 +974,7 @@ static int ac108_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_h
 		return -EINVAL;
 	}
 
-	dev_dbg(dai->dev, "rate:%d \n", params_rate(params));
+	dev_dbg(dai->dev, "params rate: %d\n", params_rate(params));
 
 	for (i = 0; i < ARRAY_SIZE(ac108_sample_rate); i++) {
 		if (ac108_sample_rate[i].real_val == params_rate(params) / (ac108->data_protocol + 1UL)) {

seeed-8mic-voicecard-overlay.dts

@@ -86,6 +86,8 @@
 				/* below is dummy master, real clock master is ac101 */
 				bitclock-master = <&codec0_dai>;
 				frame-master = <&codec0_dai>;
+				/* bitclock-inversion; */
+				/* frame-inversion; */
 
 				cpu {
 					sound-dai = <&i2s>;
@@ -106,6 +108,8 @@
 				format = "dsp_a";
 				bitclock-master = <&codec1_dai>;
 				frame-master = <&codec1_dai>;
+				/* bitclock-inversion; */
+				/* frame-inversion; */
 
 				cpu {
 					sound-dai = <&i2s>;

simple-card.c

@@ -22,6 +22,13 @@
 #include <sound/soc-dai.h>
 #include <sound/soc.h>
 
+/*
+ * single codec:
+ *	0 - allow multi codec
+ *	1 - yes
+ */
+#define _SINGLE_CODEC		1
+
 struct asoc_simple_jack {
 	struct snd_soc_jack jack;
 	struct snd_soc_jack_pin pin;
@@ -205,9 +212,10 @@ EXPORT_SYMBOL(register_start_clock);
 
 static int asoc_simple_card_trigger(struct snd_pcm_substream *substream, int cmd)
 {
+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	int ret = 0;
 
-	printk("%s() stream=%d  cmd=%d\n",
+	dev_dbg(rtd->card->dev, "%s() stream=%d  cmd=%d\n",
 		__FUNCTION__, substream->stream, cmd);
 
 	switch (cmd) {
@@ -311,9 +319,18 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
 	if (ret < 0)
 		goto dai_link_of_err;
 
+	#if _SINGLE_CODEC
 	ret = asoc_simple_card_parse_codec(codec, dai_link, DAI, CELL);
 	if (ret < 0)
 		goto dai_link_of_err;
+	#else
+	ret = snd_soc_of_get_dai_link_codecs(dev, codec, dai_link);
+	if (ret < 0) {
+		dev_err(dev, "parse codec info error %d\n", ret);
+		goto dai_link_of_err;
+	}
+	dev_dbg(dev, "dai_link num_codecs = %d\n", dai_link->num_codecs);
+	#endif
 
 	ret = asoc_simple_card_parse_platform(plat, dai_link, DAI, CELL);
 	if (ret < 0)
@@ -345,14 +362,21 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
 	if (ret < 0)
 		goto dai_link_of_err;
 
+	#if _SINGLE_CODEC
 	ret = asoc_simple_card_canonicalize_dailink(dai_link);
 	if (ret < 0)
 		goto dai_link_of_err;
+	#endif
 
 	ret = asoc_simple_card_set_dailink_name(dev, dai_link,
 						"%s-%s",
 						dai_link->cpu_dai_name,
-						dai_link->codec_dai_name);
+						#if _SINGLE_CODEC
+						dai_link->codec_dai_name
+						#else
+						dai_link->codecs[0].dai_name
+						#endif
+	);
 	if (ret < 0)
 		goto dai_link_of_err;
 
@@ -365,7 +389,11 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
 		dai_link->cpu_dai_name,
 		dai_props->cpu_dai.sysclk);
 	dev_dbg(dev, "\tcodec : %s / %d\n",
+		#if _SINGLE_CODEC
 		dai_link->codec_dai_name,
+		#else
+		dai_link->codecs[0].dai_name,
+		#endif
 		dai_props->codec_dai.sysclk);
 
 	asoc_simple_card_canonicalize_cpu(dai_link, single_cpu);