提交 9d7e584b 编写于 作者: J Jarkko Nikula 提交者: Liam Girdwood

ASoC: omap: rx51: Add FM transmitter support

Si4713 FM transmitter on Nokia RX-51/N900 is connected to same Line out
signals of TLV320AIC34 than TPA6130 headphone amplifier.

This patch adds route to transmitter and "FM Transmitter" control to keep
route active when needed.
Signed-off-by: NJarkko Nikula <jhnikula@gmail.com>
Acked-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NPeter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: NLiam Girdwood <lrg@slimlogic.co.uk>
上级 17840619
...@@ -251,6 +251,7 @@ static const struct snd_soc_dapm_widget aic34_dapm_widgets[] = { ...@@ -251,6 +251,7 @@ static const struct snd_soc_dapm_widget aic34_dapm_widgets[] = {
SND_SOC_DAPM_MIC("DMic", NULL), SND_SOC_DAPM_MIC("DMic", NULL),
SND_SOC_DAPM_HP("Headphone Jack", rx51_hp_event), SND_SOC_DAPM_HP("Headphone Jack", rx51_hp_event),
SND_SOC_DAPM_MIC("HS Mic", NULL), SND_SOC_DAPM_MIC("HS Mic", NULL),
SND_SOC_DAPM_LINE("FM Transmitter", NULL),
}; };
static const struct snd_soc_dapm_widget aic34_dapm_widgetsb[] = { static const struct snd_soc_dapm_widget aic34_dapm_widgetsb[] = {
...@@ -262,6 +263,8 @@ static const struct snd_soc_dapm_route audio_map[] = { ...@@ -262,6 +263,8 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"Ext Spk", NULL, "HPROUT"}, {"Ext Spk", NULL, "HPROUT"},
{"Headphone Jack", NULL, "LLOUT"}, {"Headphone Jack", NULL, "LLOUT"},
{"Headphone Jack", NULL, "RLOUT"}, {"Headphone Jack", NULL, "RLOUT"},
{"FM Transmitter", NULL, "LLOUT"},
{"FM Transmitter", NULL, "RLOUT"},
{"DMic Rate 64", NULL, "Mic Bias 2V"}, {"DMic Rate 64", NULL, "Mic Bias 2V"},
{"Mic Bias 2V", NULL, "DMic"}, {"Mic Bias 2V", NULL, "DMic"},
...@@ -292,6 +295,7 @@ static const struct snd_kcontrol_new aic34_rx51_controls[] = { ...@@ -292,6 +295,7 @@ static const struct snd_kcontrol_new aic34_rx51_controls[] = {
rx51_get_input, rx51_set_input), rx51_get_input, rx51_set_input),
SOC_ENUM_EXT("Jack Function", rx51_enum[2], SOC_ENUM_EXT("Jack Function", rx51_enum[2],
rx51_get_jack, rx51_set_jack), rx51_get_jack, rx51_set_jack),
SOC_DAPM_PIN_SWITCH("FM Transmitter"),
}; };
static const struct snd_kcontrol_new aic34_rx51_controlsb[] = { static const struct snd_kcontrol_new aic34_rx51_controlsb[] = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册