diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:46 +0000 |
| commit | 315472d5abca4d4db90ba654fd616b9a694c80cf (patch) | |
| tree | 27510f454328dd1fac3d3855ceac44edf1bc71d8 /sound/soc/omap | |
| parent | 56b3f31fb384124790279ad39eb02ee66df4b9fd (diff) | |
| parent | e2e8bfdf61573c98162d1112b971d8d00f00fcf8 (diff) | |
| download | op-kernel-dev-315472d5abca4d4db90ba654fd616b9a694c80cf.zip op-kernel-dev-315472d5abca4d4db90ba654fd616b9a694c80cf.tar.gz | |
Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/n810.c | 4 | ||||
| -rw-r--r-- | sound/soc/omap/rx51.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 230b8c14..ee7cd53 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -230,8 +230,8 @@ static const struct snd_soc_dapm_route audio_map[] = { {"Ext Spk", NULL, "LLOUT"}, {"Ext Spk", NULL, "RLOUT"}, - {"DMic Rate 64", NULL, "Mic Bias 2V"}, - {"Mic Bias 2V", NULL, "DMic"}, + {"DMic Rate 64", NULL, "Mic Bias"}, + {"Mic Bias", NULL, "DMic"}, }; static const char *spk_function[] = {"Off", "On"}; diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index d921ddb..3cd5257 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c @@ -248,16 +248,16 @@ static const struct snd_soc_dapm_route audio_map[] = { {"FM Transmitter", NULL, "LLOUT"}, {"FM Transmitter", NULL, "RLOUT"}, - {"DMic Rate 64", NULL, "Mic Bias 2V"}, - {"Mic Bias 2V", NULL, "DMic"}, + {"DMic Rate 64", NULL, "Mic Bias"}, + {"Mic Bias", NULL, "DMic"}, }; static const struct snd_soc_dapm_route audio_mapb[] = { {"b LINE2R", NULL, "MONO_LOUT"}, {"Earphone", NULL, "b HPLOUT"}, - {"LINE1L", NULL, "b Mic Bias 2.5V"}, - {"b Mic Bias 2.5V", NULL, "HS Mic"} + {"LINE1L", NULL, "b Mic Bias"}, + {"b Mic Bias", NULL, "HS Mic"} }; static const char *spk_function[] = {"Off", "On"}; |
