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

ASoC: fe-pi-audio: use modern dai_link style 



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

sound/soc/bcm/fe-pi-audio.c

+10 −8
Original line number Diff line number Diff line
@@ -67,18 +67,20 @@ static struct snd_soc_ops snd_fe_pi_audio_ops = { 
	.hw_params = snd_fe_pi_audio_hw_params,

};



SND_SOC_DAILINK_DEFS(fe_pi,

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

	DAILINK_COMP_ARRAY(COMP_CODEC("sgtl5000.1-000a", "sgtl5000")),

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



static struct snd_soc_dai_link snd_fe_pi_audio_dai[] = {

	{

		.name		= "FE-PI",

		.stream_name	= "Fe-Pi HiFi",

		.cpu_dai_name	= "bcm2708-i2s.0",

		.codec_dai_name	= "sgtl5000",

		.platform_name	= "bcm2708-i2s.0",

		.codec_name	= "sgtl5000.1-000a",

		.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

					SND_SOC_DAIFMT_CBM_CFM,

		.ops		= &snd_fe_pi_audio_ops,

		.init		= snd_fe_pi_audio_init,

		SND_SOC_DAILINK_REG(fe_pi),

	},

};
@@ -113,10 +115,10 @@ static int snd_fe_pi_audio_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	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;



	of_node_put(i2s_node);