]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ASoC: TWL4030: Add tristate callbacks for HiFi and Voice
authorLopez Cruz, Misael <x0052729@ti.com>
Fri, 3 Jul 2009 07:21:39 +0000 (02:21 -0500)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 3 Jul 2009 10:01:05 +0000 (11:01 +0100)
Add "set_tristate" callbacks for HiFi and Voice DAIs.
Machine drivers can enable and disable tristate for each
DAI with "snd_soc_dai_set_tristate" function.

Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/twl4030.c

index 6da94cadd1571d7469ddd882e80513f4d17b0ae2..818fb37bd7f7960693109ed0d77f87fe0d704bd5 100644 (file)
@@ -1849,6 +1849,19 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai,
        return 0;
 }
 
+static int twl4030_set_tristate(struct snd_soc_dai *dai, int tristate)
+{
+       struct snd_soc_codec *codec = dai->codec;
+       u8 reg = twl4030_read_reg_cache(codec, TWL4030_REG_AUDIO_IF);
+
+       if (tristate)
+               reg |= TWL4030_AIF_TRI_EN;
+       else
+               reg &= ~TWL4030_AIF_TRI_EN;
+
+       return twl4030_write(codec, TWL4030_REG_AUDIO_IF, reg);
+}
+
 /* In case of voice mode, the RX1 L(VRX) for downlink and the TX2 L/R
  * (VTXL, VTXR) for uplink has to be enabled/disabled. */
 static void twl4030_voice_enable(struct snd_soc_codec *codec, int direction,
@@ -2023,6 +2036,19 @@ static int twl4030_voice_set_dai_fmt(struct snd_soc_dai *codec_dai,
        return 0;
 }
 
+static int twl4030_voice_set_tristate(struct snd_soc_dai *dai, int tristate)
+{
+       struct snd_soc_codec *codec = dai->codec;
+       u8 reg = twl4030_read_reg_cache(codec, TWL4030_REG_VOICE_IF);
+
+       if (tristate)
+               reg |= TWL4030_VIF_TRI_EN;
+       else
+               reg &= ~TWL4030_VIF_TRI_EN;
+
+       return twl4030_write(codec, TWL4030_REG_VOICE_IF, reg);
+}
+
 #define TWL4030_RATES   (SNDRV_PCM_RATE_8000_48000)
 #define TWL4030_FORMATS         (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FORMAT_S24_LE)
 
@@ -2032,6 +2058,7 @@ static struct snd_soc_dai_ops twl4030_dai_ops = {
        .hw_params      = twl4030_hw_params,
        .set_sysclk     = twl4030_set_dai_sysclk,
        .set_fmt        = twl4030_set_dai_fmt,
+       .set_tristate   = twl4030_set_tristate,
 };
 
 static struct snd_soc_dai_ops twl4030_dai_voice_ops = {
@@ -2040,6 +2067,7 @@ static struct snd_soc_dai_ops twl4030_dai_voice_ops = {
        .hw_params      = twl4030_voice_hw_params,
        .set_sysclk     = twl4030_voice_set_dai_sysclk,
        .set_fmt        = twl4030_voice_set_dai_fmt,
+       .set_tristate   = twl4030_voice_set_tristate,
 };
 
 struct snd_soc_dai twl4030_dai[] = {