ASoC: ssm2602: Support setting the oscillator and the clock output state

Currently the oscillator is always enabled and the clock output is always
disabled. This patch adds support for controlling the oscillator and clock
output state through snd_soc_dai_set_sysclk. Which makes it possible to
disable or enable them dynamically according to the requirements of the board
on which the CODEC is used.

This patch also slightly modifies the behavior as to when the oscillator is
going to be disabled in low-power states. Previously it would only be disabled
in BIAS_OFF, now it is also going to be disabled in BIAS_STANDBY, since no
components which depend on it should be active in this state.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index c9e0fdbf0565033e141dc76cf10be4b83b191896..e149ec61e6be9482f3ab8888025c4d7081c49305 100644 (file)
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@ -59,6 +59,7 @@ struct ssm2602_priv {
        struct snd_pcm_substream *slave_substream;
 
        enum ssm2602_type type;
+       unsigned int clk_out_pwr;
 };
 
 /*
@@ -356,16 +357,46 @@ static int ssm2602_set_dai_sysclk(struct snd_soc_dai *codec_dai,
 {
        struct snd_soc_codec *codec = codec_dai->codec;
        struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec);
-       switch (freq) {
-       case 11289600:
-       case 12000000:
-       case 12288000:
-       case 16934400:
-       case 18432000:
-               ssm2602->sysclk = freq;
-               return 0;
+
+       if (dir == SND_SOC_CLOCK_IN) {
+               if (clk_id != SSM2602_SYSCLK)
+                       return -EINVAL;
+
+               switch (freq) {
+               case 11289600:
+               case 12000000:
+               case 12288000:
+               case 16934400:
+               case 18432000:
+                       ssm2602->sysclk = freq;
+                       break;
+               default:
+                       return -EINVAL;
+               }
+       } else {
+               unsigned int mask;
+
+               switch (clk_id) {
+               case SSM2602_CLK_CLKOUT:
+                       mask = PWR_CLK_OUT_PDN;
+                       break;
+               case SSM2602_CLK_XTO:
+                       mask = PWR_OSC_PDN;
+                       break;
+               default:
+                       return -EINVAL;
+               }
+
+               if (freq == 0)
+                       ssm2602->clk_out_pwr |= mask;
+               else
+                       ssm2602->clk_out_pwr &= ~mask;
+
+               snd_soc_update_bits(codec, SSM2602_PWR,
+                       PWR_CLK_OUT_PDN | PWR_OSC_PDN, ssm2602->clk_out_pwr);
        }
-       return -EINVAL;
+
+       return 0;
 }
 
 static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai,
@@ -430,23 +461,27 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai,
 static int ssm2602_set_bias_level(struct snd_soc_codec *codec,
                                 enum snd_soc_bias_level level)
 {
-       u16 reg = snd_soc_read(codec, SSM2602_PWR);
-       reg &= ~(PWR_POWER_OFF | PWR_OSC_PDN);
+       struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec);
 
        switch (level) {
        case SND_SOC_BIAS_ON:
-               /* vref/mid, osc on, dac unmute */
-               snd_soc_write(codec, SSM2602_PWR, reg);
+               /* vref/mid on, osc and clkout on if enabled */
+               snd_soc_update_bits(codec, SSM2602_PWR,
+                       PWR_POWER_OFF | PWR_CLK_OUT_PDN | PWR_OSC_PDN,
+                       ssm2602->clk_out_pwr);
                break;
        case SND_SOC_BIAS_PREPARE:
                break;
        case SND_SOC_BIAS_STANDBY:
                /* everything off except vref/vmid, */
-               snd_soc_write(codec, SSM2602_PWR, reg | PWR_CLK_OUT_PDN);
+               snd_soc_update_bits(codec, SSM2602_PWR,
+                       PWR_POWER_OFF | PWR_CLK_OUT_PDN | PWR_OSC_PDN,
+                       PWR_CLK_OUT_PDN | PWR_OSC_PDN);
                break;
        case SND_SOC_BIAS_OFF:
-               /* everything off, dac mute, inactive */
-               snd_soc_write(codec, SSM2602_PWR, 0xffff);
+               /* everything off */
+               snd_soc_update_bits(codec, SSM2602_PWR,
+                       PWR_POWER_OFF, PWR_POWER_OFF);
                break;
 
        }

diff --git a/sound/soc/codecs/ssm2602.h b/sound/soc/codecs/ssm2602.h
index b98c69168036d5b84744e42621e8d0732de3796d..fbd07d7b73ca2ad7bfced7147de22cec746e7bc4 100644 (file)
--- a/sound/soc/codecs/ssm2602.h
+++ b/sound/soc/codecs/ssm2602.h
@@ -116,6 +116,10 @@
 
 #define SSM2602_CACHEREGNUM    10
 
-#define SSM2602_SYSCLK 0
+enum ssm2602_clk {
+       SSM2602_SYSCLK,
+       SSM2602_CLK_CLKOUT,
+       SSM2602_CLK_XTO
+};
 
 #endif