Skip to content

Commit

Permalink
ASoC: Convert kirkwood-t5325 to table based DAPM init
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Dec 28, 2011
1 parent 7e0d6ac commit 5f5de18
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions sound/soc/kirkwood/kirkwood-t5325.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_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, "Headphone Jack");
snd_soc_dapm_enable_pin(dapm, "Speaker");
Expand Down Expand Up @@ -91,6 +86,11 @@ static struct snd_soc_card t5325 = {
.owner = THIS_MODULE,
.dai_link = 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;
Expand Down

0 comments on commit 5f5de18

Please sign in to comment.