Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 35f6d302 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: fsl: imx-es8328: 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 6aa7b409

sound/soc/fsl/imx-es8328.c

+19 −4
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ static int imx_es8328_probe(struct platform_device *pdev) 
	struct device_node *ssi_np = NULL, *codec_np = NULL;

	struct platform_device *ssi_pdev;

	struct imx_es8328_data *data;

	struct snd_soc_dai_link_component *comp;

	u32 int_port, ext_port;

	int ret;

	struct device *dev = &pdev->dev;
@@ -147,16 +148,30 @@ static int imx_es8328_probe(struct platform_device *pdev) 
		goto fail;

	}



	comp = devm_kzalloc(dev, 3 * sizeof(*comp), GFP_KERNEL);

	if (!comp) {

		ret = -ENOMEM;

		goto fail;

	}



	data->dev = dev;



	data->jack_gpio = of_get_named_gpio(pdev->dev.of_node, "jack-gpio", 0);



	data->dai.cpus		= &comp[0];

	data->dai.codecs	= &comp[1];

	data->dai.platforms	= &comp[2];



	data->dai.num_cpus	= 1;

	data->dai.num_codecs	= 1;

	data->dai.num_platforms	= 1;



	data->dai.name = "hifi";

	data->dai.stream_name = "hifi";

	data->dai.codec_dai_name = "es8328-hifi-analog";

	data->dai.codec_of_node = codec_np;

	data->dai.cpu_of_node = ssi_np;

	data->dai.platform_of_node = ssi_np;

	data->dai.codecs->dai_name = "es8328-hifi-analog";

	data->dai.codecs->of_node = codec_np;

	data->dai.cpus->of_node = ssi_np;

	data->dai.platforms->of_node = ssi_np;

	data->dai.init = &imx_es8328_dai_init;

	data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			    SND_SOC_DAIFMT_CBM_CFM;