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

ASoC: atmel: mikroe-proto: 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>
Tested-by: default avatarCodrin Ciubotariu <codrin.ciubotariu@microchip.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 19913c16

sound/soc/atmel/mikroe-proto.c

+17 −4
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ static struct snd_soc_card snd_proto = { 
static int snd_proto_probe(struct platform_device *pdev)

{

	struct snd_soc_dai_link *dai;

	struct snd_soc_dai_link_component *comp;

	struct device_node *np = pdev->dev.of_node;

	struct device_node *codec_np, *cpu_np;

	struct device_node *bitclkmaster = NULL;
@@ -87,12 +88,24 @@ static int snd_proto_probe(struct platform_device *pdev) 
	if (!dai)

		return -ENOMEM;



	/* for cpus/codecs/platforms */

	comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL);

	if (!comp)

		return -ENOMEM;



	snd_proto.dai_link = dai;

	snd_proto.num_links = 1;



	dai->cpus = &comp[0];

	dai->num_cpus = 1;

	dai->codecs = &comp[1];

	dai->num_codecs = 1;

	dai->platforms = &comp[2];

	dai->num_platforms = 1;



	dai->name = "WM8731";

	dai->stream_name = "WM8731 HiFi";

	dai->codec_dai_name = "wm8731-hifi";

	dai->codecs->dai_name = "wm8731-hifi";

	dai->init = &snd_proto_init;



	codec_np = of_parse_phandle(np, "audio-codec", 0);
@@ -100,15 +113,15 @@ static int snd_proto_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "audio-codec node missing\n");

		return -EINVAL;

	}

	dai->codec_of_node = codec_np;

	dai->codecs->of_node = codec_np;



	cpu_np = of_parse_phandle(np, "i2s-controller", 0);

	if (!cpu_np) {

		dev_err(&pdev->dev, "i2s-controller missing\n");

		return -EINVAL;

	}

	dai->cpu_of_node = cpu_np;

	dai->platform_of_node = cpu_np;

	dai->cpus->of_node = cpu_np;

	dai->platforms->of_node = cpu_np;



	dai_fmt = snd_soc_of_parse_daifmt(np, NULL,

					  &bitclkmaster, &framemaster);

CRA Git | Maintained and supported by SUSTech CRA and CCSE