Commit 5f5de18a authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

ASoC: Convert kirkwood-t5325 to table based DAPM init

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 7e0d6ac0
...@@ -59,11 +59,6 @@ static int t5325_dai_init(struct snd_soc_pcm_runtime *rtd) ...@@ -59,11 +59,6 @@ static int t5325_dai_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_codec *codec = rtd->codec; struct snd_soc_codec *codec = rtd->codec;
struct snd_soc_dapm_context *dapm = &codec->dapm; struct snd_soc_dapm_context *dapm = &codec->dapm;
snd_soc_dapm_new_controls(dapm, t5325_dapm_widgets,
ARRAY_SIZE(t5325_dapm_widgets));
snd_soc_dapm_add_routes(dapm, t5325_route, ARRAY_SIZE(t5325_route));
snd_soc_dapm_enable_pin(dapm, "Mic Jack"); snd_soc_dapm_enable_pin(dapm, "Mic Jack");
snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
snd_soc_dapm_enable_pin(dapm, "Speaker"); snd_soc_dapm_enable_pin(dapm, "Speaker");
...@@ -91,6 +86,11 @@ static struct snd_soc_card t5325 = { ...@@ -91,6 +86,11 @@ static struct snd_soc_card t5325 = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.dai_link = t5325_dai, .dai_link = t5325_dai,
.num_links = ARRAY_SIZE(t5325_dai), .num_links = ARRAY_SIZE(t5325_dai),
.dapm_widgets = t5325_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(t5325_dapm_widgets),
.dapm_routes = t5325_route,
.num_dapm_routes = ARRAY_SIZE(t5325_route),
}; };
static struct platform_device *t5325_snd_device; static struct platform_device *t5325_snd_device;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment