Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248284
b: refs/heads/master
c: b7a5d14
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown committed Apr 13, 2011
1 parent ea1715d commit 24f0c3d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 556e4fb1d801b0f977b1522e14fb06e2f3059f4c
refs/heads/master: b7a5d14c607093de1a030e9933bc8c95ab2afd3f
16 changes: 16 additions & 0 deletions trunk/sound/soc/samsung/speyside.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,19 @@ static int speyside_wm8915_init(struct snd_soc_pcm_runtime *rtd)
return 0;
}

static int speyside_late_probe(struct snd_soc_card *card)
{
snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone");
snd_soc_dapm_ignore_suspend(&card->dapm, "Headset Mic");
snd_soc_dapm_ignore_suspend(&card->dapm, "Main AMIC");
snd_soc_dapm_ignore_suspend(&card->dapm, "Main DMIC");
snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker");
snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Output");
snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Input");

return 0;
}

static struct snd_soc_dai_link speyside_dai[] = {
{
.name = "CPU",
Expand All @@ -172,6 +185,7 @@ static struct snd_soc_dai_link speyside_dai[] = {
.codec_name = "wm1250-ev1.1-0027",
.platform_name = "samsung-audio",
.ops = &speyside_ops,
.ignore_suspend = 1,
},
};

Expand Down Expand Up @@ -261,6 +275,8 @@ static struct snd_soc_card speyside = {
.num_dapm_widgets = ARRAY_SIZE(widgets),
.dapm_routes = audio_paths,
.num_dapm_routes = ARRAY_SIZE(audio_paths),

.late_probe = speyside_late_probe,
};

static __devinit int speyside_probe(struct platform_device *pdev)
Expand Down

0 comments on commit 24f0c3d

Please sign in to comment.