summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-23 21:33:07 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-23 21:41:03 +0000
commit39afd66cead742e99c051d6f3b07f89d09eebbbb (patch)
treeaace570f9d13952da3eede96d2dce38d4d2dc3b5
parent504855d171f4183ac231a5ecdf0273ac249cda2b (diff)
downloadop-kernel-dev-39afd66cead742e99c051d6f3b07f89d09eebbbb.zip
op-kernel-dev-39afd66cead742e99c051d6f3b07f89d09eebbbb.tar.gz
ASoC: Add fully_routed flag to Speyside machines
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/samsung/speyside.c3
-rw-r--r--sound/soc/samsung/speyside_wm8962.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index 85bf541..efa5187 100644
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -222,8 +222,6 @@ static struct snd_soc_dai_link speyside_dai[] = {
static int speyside_wm9081_init(struct snd_soc_dapm_context *dapm)
{
- snd_soc_dapm_nc_pin(dapm, "LINEOUT");
-
/* At any time the WM9081 is active it will have this clock */
return snd_soc_codec_set_sysclk(dapm->codec, WM9081_SYSCLK_MCLK, 0,
48000 * 256, 0);
@@ -308,6 +306,7 @@ static struct snd_soc_card speyside = {
.num_dapm_widgets = ARRAY_SIZE(widgets),
.dapm_routes = audio_paths,
.num_dapm_routes = ARRAY_SIZE(audio_paths),
+ .fully_routed = true,
.late_probe = speyside_late_probe,
};
diff --git a/sound/soc/samsung/speyside_wm8962.c b/sound/soc/samsung/speyside_wm8962.c
index e3e2716..a681c8d 100644
--- a/sound/soc/samsung/speyside_wm8962.c
+++ b/sound/soc/samsung/speyside_wm8962.c
@@ -208,6 +208,7 @@ static struct snd_soc_card speyside_wm8962 = {
.num_dapm_widgets = ARRAY_SIZE(widgets),
.dapm_routes = audio_paths,
.num_dapm_routes = ARRAY_SIZE(audio_paths),
+ .fully_routed = true,
.late_probe = speyside_wm8962_late_probe,
};
OpenPOWER on IntegriCloud