diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-05-20 05:13:28 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-20 18:29:22 -0400 |
| commit | fbfad49076646165bbd72de4dccf1d5132ab7856 (patch) | |
| tree | a643753f25b81420e10d1ee199c1167723120b5f | |
| parent | c86d50f9dc525cb0264c25ed5186faf0f1d00477 (diff) | |
ASoC: neo1973_wm8753: Automatically disconnected non-connected pins
The DAPM routes for this board are complete, hence we can let the core take care
of disconnecting non-connected pins rather than doing it manually.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/samsung/neo1973_wm8753.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c index b0800337b79e..9b4a09f14b6c 100644 --- a/sound/soc/samsung/neo1973_wm8753.c +++ b/sound/soc/samsung/neo1973_wm8753.c | |||
| @@ -271,15 +271,8 @@ static const struct snd_kcontrol_new neo1973_wm8753_controls[] = { | |||
| 271 | 271 | ||
| 272 | static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd) | 272 | static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd) |
| 273 | { | 273 | { |
| 274 | struct snd_soc_codec *codec = rtd->codec; | ||
| 275 | struct snd_soc_card *card = rtd->card; | 274 | struct snd_soc_card *card = rtd->card; |
| 276 | 275 | ||
| 277 | /* set up NC codec pins */ | ||
| 278 | snd_soc_dapm_nc_pin(&codec->dapm, "OUT3"); | ||
| 279 | snd_soc_dapm_nc_pin(&codec->dapm, "OUT4"); | ||
| 280 | snd_soc_dapm_nc_pin(&codec->dapm, "LINE1"); | ||
| 281 | snd_soc_dapm_nc_pin(&codec->dapm, "LINE2"); | ||
| 282 | |||
| 283 | /* set endpoints to default off mode */ | 276 | /* set endpoints to default off mode */ |
| 284 | snd_soc_dapm_disable_pin(&card->dapm, "GSM Line Out"); | 277 | snd_soc_dapm_disable_pin(&card->dapm, "GSM Line Out"); |
| 285 | snd_soc_dapm_disable_pin(&card->dapm, "GSM Line In"); | 278 | snd_soc_dapm_disable_pin(&card->dapm, "GSM Line In"); |
| @@ -355,6 +348,7 @@ static struct snd_soc_card neo1973 = { | |||
| 355 | .num_dapm_widgets = ARRAY_SIZE(neo1973_wm8753_dapm_widgets), | 348 | .num_dapm_widgets = ARRAY_SIZE(neo1973_wm8753_dapm_widgets), |
| 356 | .dapm_routes = neo1973_wm8753_routes, | 349 | .dapm_routes = neo1973_wm8753_routes, |
| 357 | .num_dapm_routes = ARRAY_SIZE(neo1973_wm8753_routes), | 350 | .num_dapm_routes = ARRAY_SIZE(neo1973_wm8753_routes), |
| 351 | .fully_routed = true, | ||
| 358 | }; | 352 | }; |
| 359 | 353 | ||
| 360 | static struct platform_device *neo1973_snd_device; | 354 | static struct platform_device *neo1973_snd_device; |
