[PATCH v3] ASoC: mediatek: Add second I2S on mt8173-rt5650 machine driver

[Matthias Brugger]

On 07/04/16 09:35, PC Liao wrote:
> This patch adds second I2S connection to rt5650 codec for capture path on
> mt8173-rt5650 machine driver.
>
> Signed-off-by: PC Liao <pc.liao at mediatek.com>
> ---
> Changes since v2:
> Use sound-dai to determine the capture path.
> ---
>   .../devicetree/bindings/sound/mt8173-rt5650.txt    |    6 +++
>   sound/soc/mediatek/mt8173-rt5650.c                 |   42 ++++++++++++++++++--
>   2 files changed, 44 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt
> index fe5a5ef..4ed768e 100644
> --- a/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt
> +++ b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt
> @@ -5,11 +5,17 @@ Required properties:
>   - mediatek,audio-codec: the phandles of rt5650 codecs
>   - mediatek,platform: the phandle of MT8173 ASoC platform
>
> +Optional properties:
> +- sound-dai: audio codec dai on capture path
> +  <&rt5650 0> : Default setting. Connect rt5650 I2S1 for capture. (dai_name = rt5645-aif1)
> +  <&rt5650 1> : Connect rt5650 I2S2 for capture. (dai_name = rt5645-aif2)
> +
>   Example:
>
>   	sound {
>   		compatible = "mediatek,mt8173-rt5650";
>   		mediatek,audio-codec = <&rt5650>;
>   		mediatek,platform = <&afe>;
> +		sound-dai = <&rt5650 1>;
>   	};
>
> diff --git a/sound/soc/mediatek/mt8173-rt5650.c b/sound/soc/mediatek/mt8173-rt5650.c
> index bb09bb1..9f56df9 100644
> --- a/sound/soc/mediatek/mt8173-rt5650.c
> +++ b/sound/soc/mediatek/mt8173-rt5650.c
> @@ -85,12 +85,26 @@ static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime)
>   {
>   	struct snd_soc_card *card = runtime->card;
>   	struct snd_soc_codec *codec = runtime->codec_dais[0]->codec;
> +	const char *codec_dai_capture = runtime->codec_dais[1]->name;
>   	int ret;
>
>   	rt5645_sel_asrc_clk_src(codec,
> -				RT5645_DA_STEREO_FILTER |
> -				RT5645_AD_STEREO_FILTER,
> -				RT5645_CLK_SEL_I2S1_ASRC);
> +					RT5645_DA_STEREO_FILTER,
> +					RT5645_CLK_SEL_I2S1_ASRC);
> +
> +	if (!strcmp(codec_dai_capture, "rt5645-aif1")) {
> +		rt5645_sel_asrc_clk_src(codec,
> +					RT5645_AD_STEREO_FILTER,
> +					RT5645_CLK_SEL_I2S1_ASRC);
> +	} else if (!strcmp(codec_dai_capture, "rt5645-aif2")) {
> +		rt5645_sel_asrc_clk_src(codec,
> +					RT5645_AD_STEREO_FILTER,
> +					RT5645_CLK_SEL_I2S2_ASRC);
> +	} else {
> +		dev_err(card->dev, "Can't get the right codec dai\n");
> +		return -EINVAL;

For compatibility issues we should enable RT5645_CLK_SEL_I2S1_ASRC as 
default. BTW in the old version you enabled DA and AD filter while in 
the new version you just enable AD filter. What is the reason for that?

Regards,
Matthias

> +	}
> +
>   	/* enable jack detection */
>   	ret = snd_soc_card_jack_new(card, "Headset Jack",
>   				    SND_JACK_HEADPHONE | SND_JACK_MICROPHONE |
> @@ -110,6 +124,11 @@ static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime)
>
>   static struct snd_soc_dai_link_component mt8173_rt5650_codecs[] = {
>   	{
> +		/* Playback */
> +		.dai_name = "rt5645-aif1",
> +	},
> +	{
> +		/* Capture */
>   		.dai_name = "rt5645-aif1",
>   	},
>   };
> @@ -149,7 +168,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = {
>   		.cpu_dai_name = "I2S",
>   		.no_pcm = 1,
>   		.codecs = mt8173_rt5650_codecs,
> -		.num_codecs = 1,
> +		.num_codecs = 2,
>   		.init = mt8173_rt5650_init,
>   		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
>   			   SND_SOC_DAIFMT_CBS_CFS,
> @@ -177,6 +196,7 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev)
>   {
>   	struct snd_soc_card *card = &mt8173_rt5650_card;
>   	struct device_node *platform_node;
> +	const char *codec_dai_capture;
>   	int i, ret;
>
>   	platform_node = of_parse_phandle(pdev->dev.of_node,
> @@ -199,6 +219,20 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev)
>   			"Property 'audio-codec' missing or invalid\n");
>   		return -EINVAL;
>   	}
> +	mt8173_rt5650_codecs[1].of_node = mt8173_rt5650_codecs[0].of_node;
> +
> +	if (device_property_present(&pdev->dev, "sound-dai")) {
> +		ret = snd_soc_of_get_dai_name(pdev->dev.of_node,
> +					      &codec_dai_capture);
> +		if (ret < 0) {
> +			dev_err(&pdev->dev,
> +				"%s snd_soc_of_get_dai_name fail %d\n",
> +				__func__, ret);
> +			return ret;
> +		}
> +		mt8173_rt5650_codecs[1].dai_name = codec_dai_capture;
> +	}
> +
>   	card->dev = &pdev->dev;
>   	platform_set_drvdata(pdev, card);
>
>