8 files changed, 209 insertions, 52 deletions

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 4f7f04014585..675732e724d5 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -8,7 +8,7 @@ config SND_OMAP_SOC_MCBSP
 
 config SND_OMAP_SOC_N810
         tristate "SoC Audio support for Nokia N810"
-        depends on SND_OMAP_SOC && MACH_NOKIA_N810
+        depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C
         select SND_OMAP_SOC_MCBSP
         select OMAP_MUX
         select SND_SOC_TLV320AIC3X
@@ -17,7 +17,7 @@ config SND_OMAP_SOC_N810
 
 config SND_OMAP_SOC_OSK5912
         tristate "SoC Audio support for omap osk5912"
-        depends on SND_OMAP_SOC && MACH_OMAP_OSK
+        depends on SND_OMAP_SOC && MACH_OMAP_OSK && I2C
         select SND_OMAP_SOC_MCBSP
         select SND_SOC_TLV320AIC23
         help
@@ -55,3 +55,13 @@ config SND_OMAP_SOC_OMAP3_PANDORA
         select SND_SOC_TWL4030
         help
           Say Y if you want to add support for SoC audio on the OMAP3 Pandora.
+
+config SND_OMAP_SOC_OMAP3_BEAGLE
+        tristate "SoC Audio support for OMAP3 Beagle"
+        depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3_BEAGLE
+        select SND_OMAP_SOC_MCBSP
+        select SND_SOC_TWL4030
+        help
+          Say Y if you want to add support for SoC audio on the Beagleboard.
+
+
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
index 76fedd96e365..0c9e4ac37660 100644
--- a/sound/soc/omap/Makefile
+++ b/sound/soc/omap/Makefile
@@ -12,6 +12,7 @@ snd-soc-overo-objs := overo.o
 snd-soc-omap2evm-objs := omap2evm.o
 snd-soc-sdp3430-objs := sdp3430.o
 snd-soc-omap3pandora-objs := omap3pandora.o
+snd-soc-omap3beagle-objs := omap3beagle.o
 
 obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o
 obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o
@@ -19,3 +20,4 @@ obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o
 obj-$(CONFIG_MACH_OMAP2EVM) += snd-soc-omap2evm.o
 obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o
 obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o
+obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index 25593fee9121..a6d1178ce128 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -40,6 +40,13 @@
 #define N810_HEADSET_AMP_GPIO   10
 #define N810_SPEAKER_AMP_GPIO   101
 
+enum {
+        N810_JACK_DISABLED,
+        N810_JACK_HP,
+        N810_JACK_HS,
+        N810_JACK_MIC,
+};
+
 static struct clk *sys_clkout2;
 static struct clk *sys_clkout2_src;
 static struct clk *func96m_clk;
@@ -50,15 +57,32 @@ static int n810_dmic_func;
 
 static void n810_ext_control(struct snd_soc_codec *codec)
 {
+        int hp = 0, line1l = 0;
+
+        switch (n810_jack_func) {
+        case N810_JACK_HS:
+                line1l = 1;
+        case N810_JACK_HP:
+                hp = 1;
+                break;
+        case N810_JACK_MIC:
+                line1l = 1;
+                break;
+        }
+
         if (n810_spk_func)
                 snd_soc_dapm_enable_pin(codec, "Ext Spk");
         else
                 snd_soc_dapm_disable_pin(codec, "Ext Spk");
 
-        if (n810_jack_func)
+        if (hp)
                 snd_soc_dapm_enable_pin(codec, "Headphone Jack");
         else
                 snd_soc_dapm_disable_pin(codec, "Headphone Jack");
+        if (line1l)
+                snd_soc_dapm_enable_pin(codec, "LINE1L");
+        else
+                snd_soc_dapm_disable_pin(codec, "LINE1L");
 
         if (n810_dmic_func)
                 snd_soc_dapm_enable_pin(codec, "DMic");
@@ -72,7 +96,7 @@ static int n810_startup(struct snd_pcm_substream *substream)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_codec *codec = rtd->socdev->codec;
+        struct snd_soc_codec *codec = rtd->socdev->card->codec;
 
         snd_pcm_hw_constraint_minmax(runtime,
                                      SNDRV_PCM_HW_PARAM_CHANNELS, 2, 2);
@@ -229,7 +253,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
 };
 
 static const char *spk_function[] = {"Off", "On"};
-static const char *jack_function[] = {"Off", "Headphone"};
+static const char *jack_function[] = {"Off", "Headphone", "Headset", "Mic"};
 static const char *input_function[] = {"ADC", "Digital Mic"};
 static const struct soc_enum n810_enum[] = {
         SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(spk_function), spk_function),
@@ -248,20 +272,23 @@ static const struct snd_kcontrol_new aic33_n810_controls[] = {
 
 static int n810_aic33_init(struct snd_soc_codec *codec)
 {
-        int i, err;
+        int err;
 
         /* Not connected */
         snd_soc_dapm_nc_pin(codec, "MONO_LOUT");
         snd_soc_dapm_nc_pin(codec, "HPLCOM");
         snd_soc_dapm_nc_pin(codec, "HPRCOM");
+        snd_soc_dapm_nc_pin(codec, "MIC3L");
+        snd_soc_dapm_nc_pin(codec, "MIC3R");
+        snd_soc_dapm_nc_pin(codec, "LINE1R");
+        snd_soc_dapm_nc_pin(codec, "LINE2L");
+        snd_soc_dapm_nc_pin(codec, "LINE2R");
 
         /* Add N810 specific controls */
-        for (i = 0; i < ARRAY_SIZE(aic33_n810_controls); i++) {
-                err = snd_ctl_add(codec->card,
-                        snd_soc_cnew(&aic33_n810_controls[i], codec, NULL));
-                if (err < 0)
-                        return err;
-        }
+        err = snd_soc_add_controls(codec, aic33_n810_controls,
+                                ARRAY_SIZE(aic33_n810_controls));
+        if (err < 0)
+                return err;
 
         /* Add N810 specific widgets */
         snd_soc_dapm_new_controls(codec, aic33_dapm_widgets,
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 05dd5abcddf4..d6882be33452 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -461,6 +461,16 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
         return err;
 }
 
+static struct snd_soc_dai_ops omap_mcbsp_dai_ops = {
+        .startup        = omap_mcbsp_dai_startup,
+        .shutdown       = omap_mcbsp_dai_shutdown,
+        .trigger        = omap_mcbsp_dai_trigger,
+        .hw_params      = omap_mcbsp_dai_hw_params,
+        .set_fmt        = omap_mcbsp_dai_set_dai_fmt,
+        .set_clkdiv     = omap_mcbsp_dai_set_clkdiv,
+        .set_sysclk     = omap_mcbsp_dai_set_dai_sysclk,
+};
+
 #define OMAP_MCBSP_DAI_BUILDER(link_id)                         \
 {                                                               \
         .name = "omap-mcbsp-dai-"#link_id,                      \
@@ -477,15 +487,7 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
                 .rates = OMAP_MCBSP_RATES,                      \
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,             \
         },                                                      \
-        .ops = {                                                \
-                .startup = omap_mcbsp_dai_startup,              \
-                .shutdown = omap_mcbsp_dai_shutdown,            \
-                .trigger = omap_mcbsp_dai_trigger,              \
-                .hw_params = omap_mcbsp_dai_hw_params,          \
-                .set_fmt = omap_mcbsp_dai_set_dai_fmt,          \
-                .set_clkdiv = omap_mcbsp_dai_set_clkdiv,        \
-                .set_sysclk = omap_mcbsp_dai_set_dai_sysclk,    \
-        },                                                      \
+        .ops = &omap_mcbsp_dai_ops,                             \
         .private_data = &mcbsp_data[(link_id)].bus_id,          \
 }
 
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index dd3bb2933762..8e1431cb46bb 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -265,7 +265,7 @@ static int omap_pcm_mmap(struct snd_pcm_substream *substream,
                                      runtime->dma_bytes);
 }
 
-struct snd_pcm_ops omap_pcm_ops = {
+static struct snd_pcm_ops omap_pcm_ops = {
         .open           = omap_pcm_open,
         .close          = omap_pcm_close,
         .ioctl          = snd_pcm_lib_ioctl,
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index fcc2f5d9a878..fe282d4ef422 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -143,7 +143,7 @@ static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = {
 };
 
 static const struct snd_soc_dapm_widget omap3pandora_in_dapm_widgets[] = {
-        SND_SOC_DAPM_MIC("Mic (Internal)", NULL),
+        SND_SOC_DAPM_MIC("Mic (internal)", NULL),
         SND_SOC_DAPM_MIC("Mic (external)", NULL),
         SND_SOC_DAPM_LINE("Line In", NULL),
 };
@@ -155,16 +155,33 @@ static const struct snd_soc_dapm_route omap3pandora_out_map[] = {
 };
 
 static const struct snd_soc_dapm_route omap3pandora_in_map[] = {
-        {"INL", NULL, "Line In"},
-        {"INR", NULL, "Line In"},
-        {"INL", NULL, "Mic (Internal)"},
-        {"INR", NULL, "Mic (external)"},
+        {"AUXL", NULL, "Line In"},
+        {"AUXR", NULL, "Line In"},
+
+        {"MAINMIC", NULL, "Mic Bias 1"},
+        {"Mic Bias 1", NULL, "Mic (internal)"},
+
+        {"SUBMIC", NULL, "Mic Bias 2"},
+        {"Mic Bias 2", NULL, "Mic (external)"},
 };
 
 static int omap3pandora_out_init(struct snd_soc_codec *codec)
 {
         int ret;
 
+        /* All TWL4030 output pins are floating */
+        snd_soc_dapm_nc_pin(codec, "OUTL");
+        snd_soc_dapm_nc_pin(codec, "OUTR");
+        snd_soc_dapm_nc_pin(codec, "EARPIECE");
+        snd_soc_dapm_nc_pin(codec, "PREDRIVEL");
+        snd_soc_dapm_nc_pin(codec, "PREDRIVER");
+        snd_soc_dapm_nc_pin(codec, "HSOL");
+        snd_soc_dapm_nc_pin(codec, "HSOR");
+        snd_soc_dapm_nc_pin(codec, "CARKITL");
+        snd_soc_dapm_nc_pin(codec, "CARKITR");
+        snd_soc_dapm_nc_pin(codec, "HFL");
+        snd_soc_dapm_nc_pin(codec, "HFR");
+
         ret = snd_soc_dapm_new_controls(codec, omap3pandora_out_dapm_widgets,
                                 ARRAY_SIZE(omap3pandora_out_dapm_widgets));
         if (ret < 0)
@@ -180,18 +197,11 @@ static int omap3pandora_in_init(struct snd_soc_codec *codec)
 {
         int ret;
 
-        /* All TWL4030 output pins are floating */
-        snd_soc_dapm_nc_pin(codec, "OUTL"),
-        snd_soc_dapm_nc_pin(codec, "OUTR"),
-        snd_soc_dapm_nc_pin(codec, "EARPIECE"),
-        snd_soc_dapm_nc_pin(codec, "PREDRIVEL"),
-        snd_soc_dapm_nc_pin(codec, "PREDRIVER"),
-        snd_soc_dapm_nc_pin(codec, "HSOL"),
-        snd_soc_dapm_nc_pin(codec, "HSOR"),
-        snd_soc_dapm_nc_pin(codec, "CARKITL"),
-        snd_soc_dapm_nc_pin(codec, "CARKITR"),
-        snd_soc_dapm_nc_pin(codec, "HFL"),
-        snd_soc_dapm_nc_pin(codec, "HFR"),
+        /* Not comnnected */
+        snd_soc_dapm_nc_pin(codec, "HSMIC");
+        snd_soc_dapm_nc_pin(codec, "CARKITMIC");
+        snd_soc_dapm_nc_pin(codec, "DIGIMIC0");
+        snd_soc_dapm_nc_pin(codec, "DIGIMIC1");
 
         ret = snd_soc_dapm_new_controls(codec, omap3pandora_in_dapm_widgets,
                                 ARRAY_SIZE(omap3pandora_in_dapm_widgets));
@@ -251,10 +261,9 @@ static int __init omap3pandora_soc_init(void)
 {
         int ret;
 
-        if (!machine_is_omap3_pandora()) {
-                pr_debug(PREFIX "Not OMAP3 Pandora\n");
+        if (!machine_is_omap3_pandora())
                 return -ENODEV;
-        }
+
         pr_info("OMAP3 Pandora SoC init\n");
 
         ret = gpio_request(OMAP3_PANDORA_DAC_POWER_GPIO, "dac_power");
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index cd41a948df7b..a952a4eb3361 100644
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -186,13 +186,6 @@ static int __init osk_soc_init(void)
                 return -ENODEV;
         }
 
-        if (clk_get_usecount(tlv320aic23_mclk) > 0) {
-                /* MCLK is already in use */
-                printk(KERN_WARNING
-                       "MCLK in use at %d Hz. We change it to %d Hz\n",
-                       (uint) clk_get_rate(tlv320aic23_mclk), CODEC_CLOCK);
-        }
-
         /*
          * Configure 12 MHz output on MCLK.
          */
@@ -205,9 +198,8 @@ static int __init osk_soc_init(void)
                 }
         }
 
-        printk(KERN_INFO "MCLK = %d [%d], usecount = %d\n",
-               (uint) clk_get_rate(tlv320aic23_mclk), CODEC_CLOCK,
-               clk_get_usecount(tlv320aic23_mclk));
+        printk(KERN_INFO "MCLK = %d [%d]\n",
+               (uint) clk_get_rate(tlv320aic23_mclk), CODEC_CLOCK);
 
         return 0;
 err1:
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index e226fa75669c..10f1c867f11d 100644
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -28,6 +28,7 @@
 #include <sound/pcm.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
+#include <sound/jack.h>
 
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
@@ -38,6 +39,8 @@
 #include "omap-pcm.h"
 #include "../codecs/twl4030.h"
 
+static struct snd_soc_card snd_soc_sdp3430;
+
 static int sdp3430_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params)
 {
@@ -81,12 +84,121 @@ static struct snd_soc_ops sdp3430_ops = {
         .hw_params = sdp3430_hw_params,
 };
 
+/* Headset jack */
+static struct snd_soc_jack hs_jack;
+
+/* Headset jack detection DAPM pins */
+static struct snd_soc_jack_pin hs_jack_pins[] = {
+        {
+                .pin = "Headset Mic",
+                .mask = SND_JACK_MICROPHONE,
+        },
+        {
+                .pin = "Headset Stereophone",
+                .mask = SND_JACK_HEADPHONE,
+        },
+};
+
+/* Headset jack detection gpios */
+static struct snd_soc_jack_gpio hs_jack_gpios[] = {
+        {
+                .gpio = (OMAP_MAX_GPIO_LINES + 2),
+                .name = "hsdet-gpio",
+                .report = SND_JACK_HEADSET,
+                .debounce_time = 200,
+        },
+};
+
+/* SDP3430 machine DAPM */
+static const struct snd_soc_dapm_widget sdp3430_twl4030_dapm_widgets[] = {
+        SND_SOC_DAPM_MIC("Ext Mic", NULL),
+        SND_SOC_DAPM_SPK("Ext Spk", NULL),
+        SND_SOC_DAPM_MIC("Headset Mic", NULL),
+        SND_SOC_DAPM_HP("Headset Stereophone", NULL),
+};
+
+static const struct snd_soc_dapm_route audio_map[] = {
+        /* External Mics: MAINMIC, SUBMIC with bias*/
+        {"MAINMIC", NULL, "Mic Bias 1"},
+        {"SUBMIC", NULL, "Mic Bias 2"},
+        {"Mic Bias 1", NULL, "Ext Mic"},
+        {"Mic Bias 2", NULL, "Ext Mic"},
+
+        /* External Speakers: HFL, HFR */
+        {"Ext Spk", NULL, "HFL"},
+        {"Ext Spk", NULL, "HFR"},
+
+        /* Headset Mic: HSMIC with bias */
+        {"HSMIC", NULL, "Headset Mic Bias"},
+        {"Headset Mic Bias", NULL, "Headset Mic"},
+
+        /* Headset Stereophone (Headphone): HSOL, HSOR */
+        {"Headset Stereophone", NULL, "HSOL"},
+        {"Headset Stereophone", NULL, "HSOR"},
+};
+
+static int sdp3430_twl4030_init(struct snd_soc_codec *codec)
+{
+        int ret;
+
+        /* Add SDP3430 specific widgets */
+        ret = snd_soc_dapm_new_controls(codec, sdp3430_twl4030_dapm_widgets,
+                                ARRAY_SIZE(sdp3430_twl4030_dapm_widgets));
+        if (ret)
+                return ret;
+
+        /* Set up SDP3430 specific audio path audio_map */
+        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+
+        /* SDP3430 connected pins */
+        snd_soc_dapm_enable_pin(codec, "Ext Mic");
+        snd_soc_dapm_enable_pin(codec, "Ext Spk");
+        snd_soc_dapm_disable_pin(codec, "Headset Mic");
+        snd_soc_dapm_disable_pin(codec, "Headset Stereophone");
+
+        /* TWL4030 not connected pins */
+        snd_soc_dapm_nc_pin(codec, "AUXL");
+        snd_soc_dapm_nc_pin(codec, "AUXR");
+        snd_soc_dapm_nc_pin(codec, "CARKITMIC");
+        snd_soc_dapm_nc_pin(codec, "DIGIMIC0");
+        snd_soc_dapm_nc_pin(codec, "DIGIMIC1");
+
+        snd_soc_dapm_nc_pin(codec, "OUTL");
+        snd_soc_dapm_nc_pin(codec, "OUTR");
+        snd_soc_dapm_nc_pin(codec, "EARPIECE");
+        snd_soc_dapm_nc_pin(codec, "PREDRIVEL");
+        snd_soc_dapm_nc_pin(codec, "PREDRIVER");
+        snd_soc_dapm_nc_pin(codec, "CARKITL");
+        snd_soc_dapm_nc_pin(codec, "CARKITR");
+
+        ret = snd_soc_dapm_sync(codec);
+        if (ret)
+                return ret;
+
+        /* Headset jack detection */
+        ret = snd_soc_jack_new(&snd_soc_sdp3430, "Headset Jack",
+                                SND_JACK_HEADSET, &hs_jack);
+        if (ret)
+                return ret;
+
+        ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins),
+                                hs_jack_pins);
+        if (ret)
+                return ret;
+
+        ret = snd_soc_jack_add_gpios(&hs_jack, ARRAY_SIZE(hs_jack_gpios),
+                                hs_jack_gpios);
+
+        return ret;
+}
+
 /* Digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link sdp3430_dai = {
         .name = "TWL4030",
         .stream_name = "TWL4030",
         .cpu_dai = &omap_mcbsp_dai[0],
         .codec_dai = &twl4030_dai,
+        .init = sdp3430_twl4030_init,
         .ops = &sdp3430_ops,
 };
 
@@ -142,6 +254,9 @@ module_init(sdp3430_soc_init);
 
 static void __exit sdp3430_soc_exit(void)
 {
+        snd_soc_jack_free_gpios(&hs_jack, ARRAY_SIZE(hs_jack_gpios),
+                                hs_jack_gpios);
+
         platform_device_unregister(sdp3430_snd_device);
 }
 module_exit(sdp3430_soc_exit);