1 files changed, 72 insertions, 1 deletions

diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 47d831ef2dbb..88052d29617f 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -27,6 +27,7 @@
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <sound/core.h>
+#include <sound/jack.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
@@ -37,14 +38,22 @@
 #include "omap-pcm.h"
 #include "../codecs/tlv320aic3x.h"
 
+#define RX51_TVOUT_SEL_GPIO             40
+#define RX51_JACK_DETECT_GPIO           177
 /*
  * 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
  */
 #define RX51_SPEAKER_AMP_TWL_GPIO       (192 + 7)
 
+enum {
+        RX51_JACK_DISABLED,
+        RX51_JACK_TVOUT,                /* tv-out */
+};
+
 static int rx51_spk_func;
 static int rx51_dmic_func;
+static int rx51_jack_func;
 
 static void rx51_ext_control(struct snd_soc_codec *codec)
 {
@@ -57,6 +66,9 @@ static void rx51_ext_control(struct snd_soc_codec *codec)
         else
                 snd_soc_dapm_disable_pin(codec, "DMic");
 
+        gpio_set_value(RX51_TVOUT_SEL_GPIO,
+                       rx51_jack_func == RX51_JACK_TVOUT);
+
         snd_soc_dapm_sync(codec);
 }
 
@@ -162,6 +174,40 @@ static int rx51_set_input(struct snd_kcontrol *kcontrol,
         return 1;
 }
 
+static int rx51_get_jack(struct snd_kcontrol *kcontrol,
+                         struct snd_ctl_elem_value *ucontrol)
+{
+        ucontrol->value.integer.value[0] = rx51_jack_func;
+
+        return 0;
+}
+
+static int rx51_set_jack(struct snd_kcontrol *kcontrol,
+                         struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+
+        if (rx51_jack_func == ucontrol->value.integer.value[0])
+                return 0;
+
+        rx51_jack_func = ucontrol->value.integer.value[0];
+        rx51_ext_control(codec);
+
+        return 1;
+}
+
+static struct snd_soc_jack rx51_av_jack;
+
+static struct snd_soc_jack_gpio rx51_av_jack_gpios[] = {
+        {
+                .gpio = RX51_JACK_DETECT_GPIO,
+                .name = "avdet-gpio",
+                .report = SND_JACK_VIDEOOUT,
+                .invert = 1,
+                .debounce_time = 200,
+        },
+};
+
 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),
@@ -177,10 +223,12 @@ static const struct snd_soc_dapm_route audio_map[] = {
 
 static const char *spk_function[] = {"Off", "On"};
 static const char *input_function[] = {"ADC", "Digital Mic"};
+static const char *jack_function[] = {"Off", "TV-OUT"};
 
 static const struct soc_enum rx51_enum[] = {
         SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(spk_function), spk_function),
         SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(input_function), input_function),
+        SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(jack_function), jack_function),
 };
 
 static const struct snd_kcontrol_new aic34_rx51_controls[] = {
@@ -188,10 +236,13 @@ static const struct snd_kcontrol_new aic34_rx51_controls[] = {
                      rx51_get_spk, rx51_set_spk),
         SOC_ENUM_EXT("Input Select",  rx51_enum[1],
                      rx51_get_input, rx51_set_input),
+        SOC_ENUM_EXT("Jack Function", rx51_enum[2],
+                     rx51_get_jack, rx51_set_jack),
 };
 
 static int rx51_aic34_init(struct snd_soc_codec *codec)
 {
+        struct snd_soc_card *card = codec->socdev->card;
         int err;
 
         /* Set up NC codec pins */
@@ -214,7 +265,16 @@ static int rx51_aic34_init(struct snd_soc_codec *codec)
 
         snd_soc_dapm_sync(codec);
 
-        return 0;
+        /* AV jack detection */
+        err = snd_soc_jack_new(card, "AV Jack",
+                               SND_JACK_VIDEOOUT, &rx51_av_jack);
+        if (err)
+                return err;
+        err = snd_soc_jack_add_gpios(&rx51_av_jack,
+                                     ARRAY_SIZE(rx51_av_jack_gpios),
+                                     rx51_av_jack_gpios);
+
+        return err;
 }
 
 /* Digital audio interface glue - connects codec <--> CPU */
@@ -259,6 +319,11 @@ static int __init rx51_soc_init(void)
         if (!machine_is_nokia_rx51())
                 return -ENODEV;
 
+        err = gpio_request(RX51_TVOUT_SEL_GPIO, "tvout_sel");
+        if (err)
+                goto err_gpio_tvout_sel;
+        gpio_direction_output(RX51_TVOUT_SEL_GPIO, 0);
+
         rx51_snd_device = platform_device_alloc("soc-audio", -1);
         if (!rx51_snd_device) {
                 err = -ENOMEM;
@@ -277,13 +342,19 @@ static int __init rx51_soc_init(void)
 err2:
         platform_device_put(rx51_snd_device);
 err1:
+        gpio_free(RX51_TVOUT_SEL_GPIO);
+err_gpio_tvout_sel:
 
         return err;
 }
 
 static void __exit rx51_soc_exit(void)
 {
+        snd_soc_jack_free_gpios(&rx51_av_jack, ARRAY_SIZE(rx51_av_jack_gpios),
+                                rx51_av_jack_gpios);
+
         platform_device_unregister(rx51_snd_device);
+        gpio_free(RX51_TVOUT_SEL_GPIO);
 }
 
 module_init(rx51_soc_init);