Commit d608e4d7 authored by Hui Wang's avatar Hui Wang Committed by popcornmix
Browse files

ASoC: iqaudio-codec: use modern dai_link style 



Signed-off-by: default avatarHui Wang <hui.wang@canonical.com>
parent 9c5f0eb1

sound/soc/bcm/iqaudio-codec.c

+9 −8
Original line number Diff line number Diff line
@@ -167,13 +167,13 @@ static const struct snd_soc_ops snd_rpi_iqaudio_codec_ops = { 
	.hw_params = snd_rpi_iqaudio_codec_hw_params,

};



SND_SOC_DAILINK_DEFS(rpi_iqaudio,

	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),

	DAILINK_COMP_ARRAY(COMP_CODEC("da7213.1-001a", "da7213-hifi")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2835-i2s.0")));



static struct snd_soc_dai_link snd_rpi_iqaudio_codec_dai[] = {

{

	.cpu_dai_name 		= "bcm2708-i2s.0",

	.codec_dai_name 	= "da7213-hifi",

	.platform_name 		= "bmc2708-i2s.0",

	.codec_name 		= "da7213.1-001a",

	.dai_fmt 		= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

				  SND_SOC_DAIFMT_CBM_CFM,

	.init			= snd_rpi_iqaudio_codec_init,
@@ -181,6 +181,7 @@ static struct snd_soc_dai_link snd_rpi_iqaudio_codec_dai[] = { 
	.symmetric_rates	= 1,

	.symmetric_channels	= 1,

	.symmetric_samplebits	= 1,

	SND_SOC_DAILINK_REG(rpi_iqaudio),

},

};
@@ -211,10 +212,10 @@ static int snd_rpi_iqaudio_codec_probe(struct platform_device *pdev) 
		i2s_node = of_parse_phandle(pdev->dev.of_node,

					    "i2s-controller", 0);

		if (i2s_node) {

			dai->cpu_dai_name = NULL;

			dai->cpu_of_node = i2s_node;

			dai->platform_name = NULL;

			dai->platform_of_node = i2s_node;

			dai->cpus->dai_name = NULL;

			dai->cpus->of_node = i2s_node;

			dai->platforms->name = NULL;

			dai->platforms->of_node = i2s_node;

		}



		if (of_property_read_string(pdev->dev.of_node, "card_name",