1 files changed, 36 insertions, 6 deletions

diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 2d7d4115cb71..d0986220eff9 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -40,6 +40,7 @@
 
 #define RX51_TVOUT_SEL_GPIO             40
 #define RX51_JACK_DETECT_GPIO           177
+#define RX51_ECI_SW_GPIO                182
 /*
  * REVISIT: TWL4030 GPIO base in RX-51. Now statically defined to 192. This
  * gpio is reserved in arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -50,6 +51,7 @@ enum {
         RX51_JACK_DISABLED,
         RX51_JACK_TVOUT,                /* tv-out with stereo output */
         RX51_JACK_HP,                   /* headphone: stereo output, no mic */
+        RX51_JACK_HS,                   /* headset: stereo output with mic */
 };
 
 static int rx51_spk_func;
@@ -59,11 +61,15 @@ static int rx51_jack_func;
 static void rx51_ext_control(struct snd_soc_codec *codec)
 {
         struct snd_soc_dapm_context *dapm = &codec->dapm;
-        int hp = 0, tvout = 0;
+        int hp = 0, hs = 0, tvout = 0;
 
         switch (rx51_jack_func) {
         case RX51_JACK_TVOUT:
                 tvout = 1;
+                hp = 1;
+                break;
+        case RX51_JACK_HS:
+                hs = 1;
         case RX51_JACK_HP:
                 hp = 1;
                 break;
@@ -81,6 +87,10 @@ static void rx51_ext_control(struct snd_soc_codec *codec)
                 snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
         else
                 snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+        if (hs)
+                snd_soc_dapm_enable_pin(dapm, "HS Mic");
+        else
+                snd_soc_dapm_disable_pin(dapm, "HS Mic");
 
         gpio_set_value(RX51_TVOUT_SEL_GPIO, tvout);
 
@@ -230,7 +240,7 @@ static struct snd_soc_jack_gpio rx51_av_jack_gpios[] = {
         {
                 .gpio = RX51_JACK_DETECT_GPIO,
                 .name = "avdet-gpio",
-                .report = SND_JACK_VIDEOOUT,
+                .report = SND_JACK_HEADSET,
                 .invert = 1,
                 .debounce_time = 200,
         },
@@ -240,6 +250,8 @@ static const struct snd_soc_dapm_widget aic34_dapm_widgets[] = {
         SND_SOC_DAPM_SPK("Ext Spk", rx51_spk_event),
         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[] = {
@@ -251,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"},
@@ -259,11 +273,14 @@ static const struct snd_soc_dapm_route audio_map[] = {
 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"}
 };
 
 static const char *spk_function[] = {"Off", "On"};
 static const char *input_function[] = {"ADC", "Digital Mic"};
-static const char *jack_function[] = {"Off", "TV-OUT", "Headphone"};
+static const char *jack_function[] = {"Off", "TV-OUT", "Headphone", "Headset"};
 
 static const struct soc_enum rx51_enum[] = {
         SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(spk_function), spk_function),
@@ -278,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[] = {
@@ -313,11 +331,16 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
                 return err;
         snd_soc_limit_volume(codec, "TPA6130A2 Headphone Playback Volume", 42);
 
+        err = omap_mcbsp_st_add_controls(codec, 1);
+        if (err < 0)
+                return err;
+
         snd_soc_dapm_sync(dapm);
 
         /* AV jack detection */
         err = snd_soc_jack_new(codec, "AV Jack",
-                               SND_JACK_VIDEOOUT, &rx51_av_jack);
+                               SND_JACK_HEADSET | SND_JACK_VIDEOOUT,
+                               &rx51_av_jack);
         if (err)
                 return err;
         err = snd_soc_jack_add_gpios(&rx51_av_jack,
@@ -394,10 +417,14 @@ static int __init rx51_soc_init(void)
         if (!machine_is_nokia_rx51())
                 return -ENODEV;
 
-        err = gpio_request(RX51_TVOUT_SEL_GPIO, "tvout_sel");
+        err = gpio_request_one(RX51_TVOUT_SEL_GPIO,
+                               GPIOF_DIR_OUT | GPIOF_INIT_LOW, "tvout_sel");
         if (err)
                 goto err_gpio_tvout_sel;
-        gpio_direction_output(RX51_TVOUT_SEL_GPIO, 0);
+        err = gpio_request_one(RX51_ECI_SW_GPIO,
+                               GPIOF_DIR_OUT | GPIOF_INIT_HIGH, "eci_sw");
+        if (err)
+                goto err_gpio_eci_sw;
 
         rx51_snd_device = platform_device_alloc("soc-audio", -1);
         if (!rx51_snd_device) {
@@ -415,6 +442,8 @@ static int __init rx51_soc_init(void)
 err2:
         platform_device_put(rx51_snd_device);
 err1:
+        gpio_free(RX51_ECI_SW_GPIO);
+err_gpio_eci_sw:
         gpio_free(RX51_TVOUT_SEL_GPIO);
 err_gpio_tvout_sel:
 
@@ -427,6 +456,7 @@ static void __exit rx51_soc_exit(void)
                                 rx51_av_jack_gpios);
 
         platform_device_unregister(rx51_snd_device);
+        gpio_free(RX51_ECI_SW_GPIO);
         gpio_free(RX51_TVOUT_SEL_GPIO);
 }