ASoC: Add support for on-board analogue microphones on Speyside WM8962

[pandora-kernel.git] / sound / soc / samsung / speyside_wm8962.c

diff --git a/sound/soc/samsung/speyside_wm8962.c b/sound/soc/samsung/speyside_wm8962.c
index 8ac42bf..10c06dc 100644 (file)
--- a/sound/soc/samsung/speyside_wm8962.c
+++ b/sound/soc/samsung/speyside_wm8962.c
@@ -16,6 +16,8 @@
 
 #include "../codecs/wm8962.h"
 
+static int sample_rate = 44100;
+
 static int speyside_wm8962_set_bias_level(struct snd_soc_card *card,
                                          struct snd_soc_dapm_context *dapm,
                                          enum snd_soc_bias_level level)
@@ -23,21 +25,24 @@ static int speyside_wm8962_set_bias_level(struct snd_soc_card *card,
        struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
        int ret;
 
+       if (dapm->dev != codec_dai->dev)
+               return 0;
+
        switch (level) {
        case SND_SOC_BIAS_PREPARE:
                if (dapm->bias_level == SND_SOC_BIAS_STANDBY) {
                        ret = snd_soc_dai_set_pll(codec_dai, WM8962_FLL,
                                                  WM8962_FLL_MCLK, 32768,
-                                                 44100 * 256);
+                                                 sample_rate * 512);
                        if (ret < 0)
                                pr_err("Failed to start FLL: %d\n", ret);
 
                        ret = snd_soc_dai_set_sysclk(codec_dai,
                                                     WM8962_SYSCLK_FLL,
-                                                    44100 * 256,
+                                                    sample_rate * 512,
                                                     SND_SOC_CLOCK_IN);
                        if (ret < 0) {
-                               pr_err("Failed to set SYSCLK: %d\n");
+                               pr_err("Failed to set SYSCLK: %d\n", ret);
                                return ret;
                        }
                }
@@ -57,6 +62,9 @@ static int speyside_wm8962_set_bias_level_post(struct snd_soc_card *card,
        struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
        int ret;
 
+       if (dapm->dev != codec_dai->dev)
+               return 0;
+
        switch (level) {
        case SND_SOC_BIAS_STANDBY:
                ret = snd_soc_dai_set_sysclk(codec_dai, WM8962_SYSCLK_MCLK,
@@ -103,6 +111,8 @@ static int speyside_wm8962_hw_params(struct snd_pcm_substream *substream,
        if (ret < 0)
                return ret;
 
+       sample_rate = params_rate(params);
+
        return 0;
 }
 
@@ -131,6 +141,7 @@ static struct snd_soc_dapm_widget widgets[] = {
        SND_SOC_DAPM_MIC("Headset Mic", NULL),
 
        SND_SOC_DAPM_MIC("DMIC", NULL),
+       SND_SOC_DAPM_MIC("AMIC", NULL),
 
        SND_SOC_DAPM_SPK("Main Speaker", NULL),
 };
@@ -142,12 +153,16 @@ static struct snd_soc_dapm_route audio_paths[] = {
        { "Main Speaker", NULL, "SPKOUTL" },
        { "Main Speaker", NULL, "SPKOUTR" },
 
-       { "MICBIAS", NULL, "Headset Mic" },
-       { "IN4L", NULL, "MICBIAS" },
-       { "IN4R", NULL, "MICBIAS" },
+       { "Headset Mic", NULL, "MICBIAS" },
+       { "IN4L", NULL, "Headset Mic" },
+       { "IN4R", NULL, "Headset Mic" },
+
+       { "AMIC", NULL, "MICBIAS" },
+       { "IN1L", NULL, "AMIC" },
+       { "IN1R", NULL, "AMIC" },
 
-       { "MICBIAS", NULL, "DMIC" },
-       { "DMICDAT", NULL, "MICBIAS" },
+       { "DMIC", NULL, "MICBIAS" },
+       { "DMICDAT", NULL, "DMIC" },
 };
 
 static struct snd_soc_jack speyside_wm8962_headset;