Unverified Commit 4ddabdda authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: mediatek: mt2701-cs42448: 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 b664e06d

sound/soc/mediatek/mt2701/mt2701-cs42448.c

+65 −30
Original line number Diff line number Diff line
@@ -163,118 +163,153 @@ enum { 
	DAI_LINK_BE_MRG_BT,

};



SND_SOC_DAILINK_DEFS(fe_multi_ch_out,

	DAILINK_COMP_ARRAY(COMP_CPU("PCM_multi")),

	DAILINK_COMP_ARRAY(COMP_DUMMY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(fe_pcm0_in,

	DAILINK_COMP_ARRAY(COMP_CPU("PCM0")),

	DAILINK_COMP_ARRAY(COMP_DUMMY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(fe_pcm1_in,

	DAILINK_COMP_ARRAY(COMP_CPU("PCM1")),

	DAILINK_COMP_ARRAY(COMP_DUMMY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(fe_bt_out,

	DAILINK_COMP_ARRAY(COMP_CPU("PCM_BT_DL")),

	DAILINK_COMP_ARRAY(COMP_DUMMY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(fe_bt_in,

	DAILINK_COMP_ARRAY(COMP_CPU("PCM_BT_UL")),

	DAILINK_COMP_ARRAY(COMP_DUMMY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(be_i2s0,

	DAILINK_COMP_ARRAY(COMP_CPU("I2S0")),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42448")),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(be_i2s1,

	DAILINK_COMP_ARRAY(COMP_CPU("I2S1")),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42448")),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(be_i2s2,

	DAILINK_COMP_ARRAY(COMP_CPU("I2S2")),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42448")),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(be_i2s3,

	DAILINK_COMP_ARRAY(COMP_CPU("I2S3")),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42448")),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(be_mrg_bt,

	DAILINK_COMP_ARRAY(COMP_CPU("MRG BT")),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "bt-sco-pcm-wb")),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {

	/* FE */

	[DAI_LINK_FE_MULTI_CH_OUT] = {

		.name = "mt2701-cs42448-multi-ch-out",

		.stream_name = "mt2701-cs42448-multi-ch-out",

		.cpu_dai_name = "PCM_multi",

		.codec_name = "snd-soc-dummy",

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

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ops = &mt2701_cs42448_48k_fe_ops,

		.dynamic = 1,

		.dpcm_playback = 1,

		SND_SOC_DAILINK_REG(fe_multi_ch_out),

	},

	[DAI_LINK_FE_PCM0_IN] = {

		.name = "mt2701-cs42448-pcm0",

		.stream_name = "mt2701-cs42448-pcm0-data-UL",

		.cpu_dai_name = "PCM0",

		.codec_name = "snd-soc-dummy",

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

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ops = &mt2701_cs42448_48k_fe_ops,

		.dynamic = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(fe_pcm0_in),

	},

	[DAI_LINK_FE_PCM1_IN] = {

		.name = "mt2701-cs42448-pcm1-data-UL",

		.stream_name = "mt2701-cs42448-pcm1-data-UL",

		.cpu_dai_name = "PCM1",

		.codec_name = "snd-soc-dummy",

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

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ops = &mt2701_cs42448_48k_fe_ops,

		.dynamic = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(fe_pcm1_in),

	},

	[DAI_LINK_FE_BT_OUT] = {

		.name = "mt2701-cs42448-pcm-BT-out",

		.stream_name = "mt2701-cs42448-pcm-BT",

		.cpu_dai_name = "PCM_BT_DL",

		.codec_name = "snd-soc-dummy",

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

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.dynamic = 1,

		.dpcm_playback = 1,

		SND_SOC_DAILINK_REG(fe_bt_out),

	},

	[DAI_LINK_FE_BT_IN] = {

		.name = "mt2701-cs42448-pcm-BT-in",

		.stream_name = "mt2701-cs42448-pcm-BT",

		.cpu_dai_name = "PCM_BT_UL",

		.codec_name = "snd-soc-dummy",

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

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.dynamic = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(fe_bt_in),

	},

	/* BE */

	[DAI_LINK_BE_I2S0] = {

		.name = "mt2701-cs42448-I2S0",

		.cpu_dai_name = "I2S0",

		.no_pcm = 1,

		.codec_dai_name = "cs42448",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS

			 | SND_SOC_DAIFMT_GATED,

		.ops = &mt2701_cs42448_be_ops,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(be_i2s0),

	},

	[DAI_LINK_BE_I2S1] = {

		.name = "mt2701-cs42448-I2S1",

		.cpu_dai_name = "I2S1",

		.no_pcm = 1,

		.codec_dai_name = "cs42448",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS

			 | SND_SOC_DAIFMT_GATED,

		.ops = &mt2701_cs42448_be_ops,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(be_i2s1),

	},

	[DAI_LINK_BE_I2S2] = {

		.name = "mt2701-cs42448-I2S2",

		.cpu_dai_name = "I2S2",

		.no_pcm = 1,

		.codec_dai_name = "cs42448",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS

			 | SND_SOC_DAIFMT_GATED,

		.ops = &mt2701_cs42448_be_ops,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(be_i2s2),

	},

	[DAI_LINK_BE_I2S3] = {

		.name = "mt2701-cs42448-I2S3",

		.cpu_dai_name = "I2S3",

		.no_pcm = 1,

		.codec_dai_name = "cs42448",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS

			 | SND_SOC_DAIFMT_GATED,

		.ops = &mt2701_cs42448_be_ops,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(be_i2s3),

	},

	[DAI_LINK_BE_MRG_BT] = {

		.name = "mt2701-cs42448-MRG-BT",

		.cpu_dai_name = "MRG BT",

		.no_pcm = 1,

		.codec_dai_name = "bt-sco-pcm-wb",

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(be_mrg_bt),

	},

};
@@ -311,9 +346,9 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) 
		return -EINVAL;

	}

	for_each_card_prelinks(card, i, dai_link) {

		if (dai_link->platform_name)

		if (dai_link->platforms->name)

			continue;

		dai_link->platform_of_node = platform_node;

		dai_link->platforms->of_node = platform_node;

	}



	card->dev = dev;
@@ -326,9 +361,9 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) 
		return -EINVAL;

	}

	for_each_card_prelinks(card, i, dai_link) {

		if (dai_link->codec_name)

		if (dai_link->codecs->name)

			continue;

		dai_link->codec_of_node = codec_node;

		dai_link->codecs->of_node = codec_node;

	}



	codec_node_bt_mrg = of_parse_phandle(pdev->dev.of_node,
@@ -338,7 +373,7 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) 
			"Property 'audio-codec-bt-mrg' missing or invalid\n");

		return -EINVAL;

	}

	mt2701_cs42448_dai_links[DAI_LINK_BE_MRG_BT].codec_of_node

	mt2701_cs42448_dai_links[DAI_LINK_BE_MRG_BT].codecs->of_node

							= codec_node_bt_mrg;



	ret = snd_soc_of_parse_audio_routing(card, "audio-routing");