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

ASoC: atmel: atmel-wm8904: 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 1199dd99

sound/soc/atmel/atmel_wm8904.c

+11 −6
Original line number Diff line number Diff line
@@ -57,14 +57,19 @@ static const struct snd_soc_ops atmel_asoc_wm8904_ops = { 
	.hw_params = atmel_asoc_wm8904_hw_params,

};



SND_SOC_DAILINK_DEFS(pcm,

	DAILINK_COMP_ARRAY(COMP_EMPTY()),

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

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



static struct snd_soc_dai_link atmel_asoc_wm8904_dailink = {

	.name = "WM8904",

	.stream_name = "WM8904 PCM",

	.codec_dai_name = "wm8904-hifi",

	.dai_fmt = SND_SOC_DAIFMT_I2S

		| SND_SOC_DAIFMT_NB_NF

		| SND_SOC_DAIFMT_CBM_CFM,

	.ops = &atmel_asoc_wm8904_ops,

	SND_SOC_DAILINK_REG(pcm),

};



static struct snd_soc_card atmel_asoc_wm8904_card = {
@@ -108,8 +113,8 @@ static int atmel_asoc_wm8904_dt_init(struct platform_device *pdev) 
		ret = -EINVAL;

		return ret;

	}

	dailink->cpu_of_node = cpu_np;

	dailink->platform_of_node = cpu_np;

	dailink->cpus->of_node = cpu_np;

	dailink->platforms->of_node = cpu_np;

	of_node_put(cpu_np);



	codec_np = of_parse_phandle(np, "atmel,audio-codec", 0);
@@ -118,7 +123,7 @@ static int atmel_asoc_wm8904_dt_init(struct platform_device *pdev) 
		ret = -EINVAL;

		return ret;

	}

	dailink->codec_of_node = codec_np;

	dailink->codecs->of_node = codec_np;

	of_node_put(codec_np);



	return 0;
@@ -137,7 +142,7 @@ static int atmel_asoc_wm8904_probe(struct platform_device *pdev) 
		return ret;

	}



	id = of_alias_get_id((struct device_node *)dailink->cpu_of_node, "ssc");

	id = of_alias_get_id((struct device_node *)dailink->cpus->of_node, "ssc");

	ret = atmel_ssc_set_audio(id);

	if (ret != 0) {

		dev_err(&pdev->dev, "failed to set SSC %d for audio\n", id);
@@ -163,7 +168,7 @@ static int atmel_asoc_wm8904_remove(struct platform_device *pdev) 
	struct snd_soc_dai_link *dailink = &atmel_asoc_wm8904_dailink;

	int id;



	id = of_alias_get_id((struct device_node *)dailink->cpu_of_node, "ssc");

	id = of_alias_get_id((struct device_node *)dailink->cpus->of_node, "ssc");



	snd_soc_unregister_card(card);

	atmel_ssc_put_audio(id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE