[PATCH] ASoC: omap: rx51: Add FM transmitter support

[PATCH] ASoC: omap: rx51: Add FM transmitter support

[Jarkko Nikula]

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: Jarkko Nikula <jhnikula@gmail.com>
---
- Liam: This goes on top of previous rx51 update (I didn't find those from
  your tree):
  http://mailman.alsa-project.org/pipermail/alsa-devel/2011-February/036972.html
- For those who are keen to try you need following patch in order to be able
  to activate the FM transmitter:
  http://marc.info/?l=linux-omap&m=129827572706543&w=2
  Otherwise there is no any build or runtime dependency to Si4713 driver.
---
 sound/soc/omap/rx51.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index e28f089..055e447 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -251,6 +251,7 @@ static const struct snd_soc_dapm_widget aic34_dapm_widgets[] = {
 	SND_SOC_DAPM_MIC("DMic", NULL),
 	SND_SOC_DAPM_HP("Headphone Jack", rx51_hp_event),
 	SND_SOC_DAPM_MIC("HS Mic", NULL),
+	SND_SOC_DAPM_LINE("FM Transmitter", NULL),
 };
 
 static const struct snd_soc_dapm_widget aic34_dapm_widgetsb[] = {
@@ -262,6 +263,8 @@ static const struct snd_soc_dapm_route audio_map[] = {
 	{"Ext Spk", NULL, "HPROUT"},
 	{"Headphone Jack", NULL, "LLOUT"},
 	{"Headphone Jack", NULL, "RLOUT"},
+	{"FM Transmitter", NULL, "LLOUT"},
+	{"FM Transmitter", NULL, "RLOUT"},
 
 	{"DMic Rate 64", NULL, "Mic Bias 2V"},
 	{"Mic Bias 2V", NULL, "DMic"},
@@ -292,6 +295,7 @@ static const struct snd_kcontrol_new aic34_rx51_controls[] = {
 		     rx51_get_input, rx51_set_input),
 	SOC_ENUM_EXT("Jack Function", rx51_enum[2],
 		     rx51_get_jack, rx51_set_jack),
+	SOC_DAPM_PIN_SWITCH("FM Transmitter"),
 };
 
 static const struct snd_kcontrol_new aic34_rx51_controlsb[] = {
-- 
1.7.2.3

Re: [PATCH] ASoC: omap: rx51: Add FM transmitter support

[Mark Brown]

On Mon, Feb 21, 2011 at 02:57:22PM +0200, Jarkko Nikula wrote:
> 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: Jarkko Nikula <jhnikula@gmail.com>

Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

Re: [PATCH] ASoC: omap: rx51: Add FM transmitter support

[Peter Ujfalusi]

On 02/21/11 14:57, ext Jarkko Nikula wrote:
> 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: Jarkko Nikula <jhnikula@gmail.com>

...

>  	{"DMic Rate 64", NULL, "Mic Bias 2V"},
>  	{"Mic Bias 2V", NULL, "DMic"},
> @@ -292,6 +295,7 @@ static const struct snd_kcontrol_new aic34_rx51_controls[] = {
>  		     rx51_get_input, rx51_set_input),
>  	SOC_ENUM_EXT("Jack Function", rx51_enum[2],
>  		     rx51_get_jack, rx51_set_jack),

Have you thought of converting the 'Jack Function' to DAPM_PIN_SWITCH as
well?

> +	SOC_DAPM_PIN_SWITCH("FM Transmitter"),
>  };
>  
>  static const struct snd_kcontrol_new aic34_rx51_controlsb[] = {

Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>

Re: [PATCH] ASoC: omap: rx51: Add FM transmitter support

[Jarkko Nikula]

On Tue, 22 Feb 2011 08:59:11 +0200
Peter Ujfalusi <peter.ujfalusi@nokia.com> wrote:

> >  	{"DMic Rate 64", NULL, "Mic Bias 2V"},
> >  	{"Mic Bias 2V", NULL, "DMic"},
> > @@ -292,6 +295,7 @@ static const struct snd_kcontrol_new aic34_rx51_controls[] = {
> >  		     rx51_get_input, rx51_set_input),
> >  	SOC_ENUM_EXT("Jack Function", rx51_enum[2],
> >  		     rx51_get_jack, rx51_set_jack),
> 
> Have you thought of converting the 'Jack Function' to DAPM_PIN_SWITCH as
> well?
> 
Yes, but then I realized it has multiple functions (that I
implemented) :-)

-- 
Jarkko

Re: [PATCH] ASoC: omap: rx51: Add FM transmitter support

[Liam Girdwood]

On Mon, 2011-02-21 at 14:57 +0200, Jarkko Nikula wrote:
> 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: Jarkko Nikula <jhnikula@gmail.com>
> ---
> - Liam: This goes on top of previous rx51 update (I didn't find those from
>   your tree):

Sorry, just been travelling and have now pushed.

>   http://mailman.alsa-project.org/pipermail/alsa-devel/2011-February/036972.html
> - For those who are keen to try you need following patch in order to be able
>   to activate the FM transmitter:
>   http://marc.info/?l=linux-omap&m=129827572706543&w=2
>   Otherwise there is no any build or runtime dependency to Si4713 driver.
> ---
>  sound/soc/omap/rx51.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)

Applied.

Thanks

Liam