Unverified Commit 166b3f05 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: mediatek: mt8173-rt5650: use modern dai_link style 



ASoC is now supporting modern style dai_link
(= snd_soc_dai_link_component) for CPU/Codec/Platform.
This patch switches to use it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1ea15792

sound/soc/mediatek/mt8173/mt8173-rt5650.c

+41 −33
Original line number Original line Diff line number Diff line
@@ -144,17 +144,6 @@ static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime) 
				      &mt8173_rt5650_jack);

				      &mt8173_rt5650_jack);

}

}





static struct snd_soc_dai_link_component mt8173_rt5650_codecs[] = {

	{

		/* Playback */

		.dai_name = "rt5645-aif1",

	},

	{

		/* Capture */

		.dai_name = "rt5645-aif1",

	},

};



enum {

enum {

	DAI_LINK_PLAYBACK,

	DAI_LINK_PLAYBACK,

	DAI_LINK_CAPTURE,

	DAI_LINK_CAPTURE,
@@ -163,46 +152,63 @@ enum { 
	DAI_LINK_HDMI_I2S,

	DAI_LINK_HDMI_I2S,

};

};





SND_SOC_DAILINK_DEFS(playback,

	DAILINK_COMP_ARRAY(COMP_CPU("DL1")),

	DAILINK_COMP_ARRAY(COMP_DUMMY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(capture,

	DAILINK_COMP_ARRAY(COMP_CPU("VUL")),

	DAILINK_COMP_ARRAY(COMP_DUMMY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(hdmi_pcm,

	DAILINK_COMP_ARRAY(COMP_CPU("HDMI")),

	DAILINK_COMP_ARRAY(COMP_DUMMY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(codec,

	DAILINK_COMP_ARRAY(COMP_CPU("I2S")),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5645-aif1"), /* Playback */

			   COMP_CODEC(NULL, "rt5645-aif1")),/* Capture */

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(hdmi_be,

	DAILINK_COMP_ARRAY(COMP_CPU("HDMIO")),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "i2s-hifi")),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



/* Digital audio interface glue - connects codec <---> CPU */

/* Digital audio interface glue - connects codec <---> CPU */

static struct snd_soc_dai_link mt8173_rt5650_dais[] = {

static struct snd_soc_dai_link mt8173_rt5650_dais[] = {

	/* Front End DAI links */

	/* Front End DAI links */

	[DAI_LINK_PLAYBACK] = {

	[DAI_LINK_PLAYBACK] = {

		.name = "rt5650 Playback",

		.name = "rt5650 Playback",

		.stream_name = "rt5650 Playback",

		.stream_name = "rt5650 Playback",

		.cpu_dai_name = "DL1",

		.codec_name = "snd-soc-dummy",

		.codec_dai_name = "snd-soc-dummy-dai",

		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.dynamic = 1,

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_playback = 1,

		SND_SOC_DAILINK_REG(playback),

	},

	},

	[DAI_LINK_CAPTURE] = {

	[DAI_LINK_CAPTURE] = {

		.name = "rt5650 Capture",

		.name = "rt5650 Capture",

		.stream_name = "rt5650 Capture",

		.stream_name = "rt5650 Capture",

		.cpu_dai_name = "VUL",

		.codec_name = "snd-soc-dummy",

		.codec_dai_name = "snd-soc-dummy-dai",

		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.dynamic = 1,

		.dynamic = 1,

		.dpcm_capture = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(capture),

	},

	},

	[DAI_LINK_HDMI] = {

	[DAI_LINK_HDMI] = {

		.name = "HDMI",

		.name = "HDMI",

		.stream_name = "HDMI PCM",

		.stream_name = "HDMI PCM",

		.cpu_dai_name = "HDMI",

		.codec_name = "snd-soc-dummy",

		.codec_dai_name = "snd-soc-dummy-dai",

		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.dynamic = 1,

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_playback = 1,

		SND_SOC_DAILINK_REG(hdmi_pcm),

	},

	},

	/* Back End DAI links */

	/* Back End DAI links */

	[DAI_LINK_CODEC_I2S] = {

	[DAI_LINK_CODEC_I2S] = {

		.name = "Codec",

		.name = "Codec",

		.cpu_dai_name = "I2S",

		.no_pcm = 1,

		.no_pcm = 1,

		.codecs = mt8173_rt5650_codecs,

		.num_codecs = 2,

		.init = mt8173_rt5650_init,

		.init = mt8173_rt5650_init,

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			   SND_SOC_DAIFMT_CBS_CFS,

			   SND_SOC_DAIFMT_CBS_CFS,
@@ -210,13 +216,13 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { 
		.ignore_pmdown_time = 1,

		.ignore_pmdown_time = 1,

		.dpcm_playback = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(codec),

	},

	},

	[DAI_LINK_HDMI_I2S] = {

	[DAI_LINK_HDMI_I2S] = {

		.name = "HDMI BE",

		.name = "HDMI BE",

		.cpu_dai_name = "HDMIO",

		.no_pcm = 1,

		.no_pcm = 1,

		.codec_dai_name = "i2s-hifi",

		.dpcm_playback = 1,

		.dpcm_playback = 1,

		SND_SOC_DAILINK_REG(hdmi_be),

	},

	},

};

};
@@ -250,19 +256,20 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) 
	}

	}





	for_each_card_prelinks(card, i, dai_link) {

	for_each_card_prelinks(card, i, dai_link) {

		if (dai_link->platform_name)

		if (dai_link->platforms->name)

			continue;

			continue;

		dai_link->platform_of_node = platform_node;

		dai_link->platforms->of_node = platform_node;

	}

	}





	mt8173_rt5650_codecs[0].of_node =

	mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node =

		of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 0);

		of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 0);

	if (!mt8173_rt5650_codecs[0].of_node) {

	if (!mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node) {

		dev_err(&pdev->dev,

		dev_err(&pdev->dev,

			"Property 'audio-codec' missing or invalid\n");

			"Property 'audio-codec' missing or invalid\n");

		return -EINVAL;

		return -EINVAL;

	}

	}

	mt8173_rt5650_codecs[1].of_node = mt8173_rt5650_codecs[0].of_node;

	mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node =

		mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node;





	np = of_get_child_by_name(pdev->dev.of_node, "codec-capture");

	np = of_get_child_by_name(pdev->dev.of_node, "codec-capture");

	if (np) {

	if (np) {
@@ -274,7 +281,8 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) 
				__func__, ret);

				__func__, ret);

			return ret;

			return ret;

		}

		}

		mt8173_rt5650_codecs[1].dai_name = codec_capture_dai;

		mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[1].dai_name =

			codec_capture_dai;

	}

	}





	if (device_property_present(&pdev->dev, "mediatek,mclk")) {

	if (device_property_present(&pdev->dev, "mediatek,mclk")) {
@@ -288,9 +296,9 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) 
		}

		}

	}

	}





	mt8173_rt5650_dais[DAI_LINK_HDMI_I2S].codec_of_node =

	mt8173_rt5650_dais[DAI_LINK_HDMI_I2S].codecs->of_node =

		of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 1);

		of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 1);

	if (!mt8173_rt5650_dais[DAI_LINK_HDMI_I2S].codec_of_node) {

	if (!mt8173_rt5650_dais[DAI_LINK_HDMI_I2S].codecs->of_node) {

		dev_err(&pdev->dev,

		dev_err(&pdev->dev,

			"Property 'audio-codec' missing or invalid\n");

			"Property 'audio-codec' missing or invalid\n");

		return -EINVAL;

		return -EINVAL;