diff options
Diffstat (limited to 'sound/soc/omap/rx51.c')
| -rw-r--r-- | sound/soc/omap/rx51.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index fded99362d39..3bebfb1d3a6f 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c | |||
| @@ -245,6 +245,8 @@ static const struct snd_soc_dapm_widget aic34_dapm_widgets[] = { | |||
| 245 | static const struct snd_soc_dapm_route audio_map[] = { | 245 | static const struct snd_soc_dapm_route audio_map[] = { |
| 246 | {"Ext Spk", NULL, "HPLOUT"}, | 246 | {"Ext Spk", NULL, "HPLOUT"}, |
| 247 | {"Ext Spk", NULL, "HPROUT"}, | 247 | {"Ext Spk", NULL, "HPROUT"}, |
| 248 | {"Ext Spk", NULL, "HPLCOM"}, | ||
| 249 | {"Ext Spk", NULL, "HPRCOM"}, | ||
| 248 | {"Headphone Jack", NULL, "LLOUT"}, | 250 | {"Headphone Jack", NULL, "LLOUT"}, |
| 249 | {"Headphone Jack", NULL, "RLOUT"}, | 251 | {"Headphone Jack", NULL, "RLOUT"}, |
| 250 | {"FM Transmitter", NULL, "LLOUT"}, | 252 | {"FM Transmitter", NULL, "LLOUT"}, |
| @@ -288,15 +290,8 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd) | |||
| 288 | struct snd_soc_codec *codec = rtd->codec; | 290 | struct snd_soc_codec *codec = rtd->codec; |
| 289 | struct snd_soc_card *card = rtd->card; | 291 | struct snd_soc_card *card = rtd->card; |
| 290 | struct rx51_audio_pdata *pdata = snd_soc_card_get_drvdata(card); | 292 | struct rx51_audio_pdata *pdata = snd_soc_card_get_drvdata(card); |
| 291 | |||
| 292 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
| 293 | int err; | 293 | int err; |
| 294 | 294 | ||
| 295 | /* Set up NC codec pins */ | ||
| 296 | snd_soc_dapm_nc_pin(dapm, "MIC3L"); | ||
| 297 | snd_soc_dapm_nc_pin(dapm, "MIC3R"); | ||
| 298 | snd_soc_dapm_nc_pin(dapm, "LINE1R"); | ||
| 299 | |||
| 300 | err = tpa6130a2_add_controls(codec); | 295 | err = tpa6130a2_add_controls(codec); |
| 301 | if (err < 0) { | 296 | if (err < 0) { |
| 302 | dev_err(card->dev, "Failed to add TPA6130A2 controls\n"); | 297 | dev_err(card->dev, "Failed to add TPA6130A2 controls\n"); |
| @@ -383,6 +378,7 @@ static struct snd_soc_card rx51_sound_card = { | |||
| 383 | .num_aux_devs = ARRAY_SIZE(rx51_aux_dev), | 378 | .num_aux_devs = ARRAY_SIZE(rx51_aux_dev), |
| 384 | .codec_conf = rx51_codec_conf, | 379 | .codec_conf = rx51_codec_conf, |
| 385 | .num_configs = ARRAY_SIZE(rx51_codec_conf), | 380 | .num_configs = ARRAY_SIZE(rx51_codec_conf), |
| 381 | .fully_routed = true, | ||
| 386 | 382 | ||
| 387 | .controls = aic34_rx51_controls, | 383 | .controls = aic34_rx51_controls, |
| 388 | .num_controls = ARRAY_SIZE(aic34_rx51_controls), | 384 | .num_controls = ARRAY_SIZE(aic34_rx51_controls), |
