diff options
-rw-r--r-- | sound/soc/samsung/speyside.c | 3 | ||||
-rw-r--r-- | sound/soc/samsung/speyside_wm8962.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 85bf541a771d..efa5187f6197 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[] = { | |||
222 | 222 | ||
223 | static int speyside_wm9081_init(struct snd_soc_dapm_context *dapm) | 223 | static int speyside_wm9081_init(struct snd_soc_dapm_context *dapm) |
224 | { | 224 | { |
225 | snd_soc_dapm_nc_pin(dapm, "LINEOUT"); | ||
226 | |||
227 | /* At any time the WM9081 is active it will have this clock */ | 225 | /* At any time the WM9081 is active it will have this clock */ |
228 | return snd_soc_codec_set_sysclk(dapm->codec, WM9081_SYSCLK_MCLK, 0, | 226 | return snd_soc_codec_set_sysclk(dapm->codec, WM9081_SYSCLK_MCLK, 0, |
229 | 48000 * 256, 0); | 227 | 48000 * 256, 0); |
@@ -308,6 +306,7 @@ static struct snd_soc_card speyside = { | |||
308 | .num_dapm_widgets = ARRAY_SIZE(widgets), | 306 | .num_dapm_widgets = ARRAY_SIZE(widgets), |
309 | .dapm_routes = audio_paths, | 307 | .dapm_routes = audio_paths, |
310 | .num_dapm_routes = ARRAY_SIZE(audio_paths), | 308 | .num_dapm_routes = ARRAY_SIZE(audio_paths), |
309 | .fully_routed = true, | ||
311 | 310 | ||
312 | .late_probe = speyside_late_probe, | 311 | .late_probe = speyside_late_probe, |
313 | }; | 312 | }; |
diff --git a/sound/soc/samsung/speyside_wm8962.c b/sound/soc/samsung/speyside_wm8962.c index e3e27166cc50..a681c8d74118 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 = { | |||
208 | .num_dapm_widgets = ARRAY_SIZE(widgets), | 208 | .num_dapm_widgets = ARRAY_SIZE(widgets), |
209 | .dapm_routes = audio_paths, | 209 | .dapm_routes = audio_paths, |
210 | .num_dapm_routes = ARRAY_SIZE(audio_paths), | 210 | .num_dapm_routes = ARRAY_SIZE(audio_paths), |
211 | .fully_routed = true, | ||
211 | 212 | ||
212 | .late_probe = speyside_wm8962_late_probe, | 213 | .late_probe = speyside_wm8962_late_probe, |
213 | }; | 214 | }; |