Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic...

[cascardo/linux.git] / sound / soc / codecs / ssm2602.c

diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index 484b3bb..314eaec 100644 (file)
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@ -192,7 +192,7 @@ static const struct snd_pcm_hw_constraint_list ssm2602_constraints_12288000 = {
 };
 
 static const unsigned int ssm2602_rates_11289600[] = {
-       8000, 44100, 88200,
+       8000, 11025, 22050, 44100, 88200,
 };
 
 static const struct snd_pcm_hw_constraint_list ssm2602_constraints_11289600 = {
@@ -237,6 +237,16 @@ static const struct ssm2602_coeff ssm2602_coeff_table[] = {
        {18432000, 96000, SSM2602_COEFF_SRATE(0x7, 0x1, 0x0)},
        {12000000, 96000, SSM2602_COEFF_SRATE(0x7, 0x0, 0x1)},
 
+       /* 11.025k */
+       {11289600, 11025, SSM2602_COEFF_SRATE(0xc, 0x0, 0x0)},
+       {16934400, 11025, SSM2602_COEFF_SRATE(0xc, 0x1, 0x0)},
+       {12000000, 11025, SSM2602_COEFF_SRATE(0xc, 0x1, 0x1)},
+
+       /* 22.05k */
+       {11289600, 22050, SSM2602_COEFF_SRATE(0xd, 0x0, 0x0)},
+       {16934400, 22050, SSM2602_COEFF_SRATE(0xd, 0x1, 0x0)},
+       {12000000, 22050, SSM2602_COEFF_SRATE(0xd, 0x1, 0x1)},
+
        /* 44.1k */
        {11289600, 44100, SSM2602_COEFF_SRATE(0x8, 0x0, 0x0)},
        {16934400, 44100, SSM2602_COEFF_SRATE(0x8, 0x1, 0x0)},
@@ -467,7 +477,8 @@ static int ssm2602_set_bias_level(struct snd_soc_codec *codec,
        return 0;
 }
 
-#define SSM2602_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
+#define SSM2602_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
+               SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\
                SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\
                SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |\
                SNDRV_PCM_RATE_96000)
@@ -502,18 +513,11 @@ static struct snd_soc_dai_driver ssm2602_dai = {
        .symmetric_samplebits = 1,
 };
 
-static int ssm2602_suspend(struct snd_soc_codec *codec)
-{
-       ssm2602_set_bias_level(codec, SND_SOC_BIAS_OFF);
-       return 0;
-}
-
 static int ssm2602_resume(struct snd_soc_codec *codec)
 {
        struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec);
 
        regcache_sync(ssm2602->regmap);
-       ssm2602_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
        return 0;
 }
@@ -586,27 +590,14 @@ static int ssm260x_codec_probe(struct snd_soc_codec *codec)
                break;
        }
 
-       if (ret)
-               return ret;
-
-       ssm2602_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
-       return 0;
-}
-
-/* remove everything here */
-static int ssm2602_remove(struct snd_soc_codec *codec)
-{
-       ssm2602_set_bias_level(codec, SND_SOC_BIAS_OFF);
-       return 0;
+       return ret;
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_ssm2602 = {
        .probe =        ssm260x_codec_probe,
-       .remove =       ssm2602_remove,
-       .suspend =      ssm2602_suspend,
        .resume =       ssm2602_resume,
        .set_bias_level = ssm2602_set_bias_level,
+       .suspend_bias_off = true,
 
        .controls = ssm260x_snd_controls,
        .num_controls = ARRAY_SIZE(ssm260x_snd_controls),
@@ -647,7 +638,7 @@ int ssm2602_probe(struct device *dev, enum ssm2602_type type,
                return -ENOMEM;
 
        dev_set_drvdata(dev, ssm2602);
-       ssm2602->type = SSM2602;
+       ssm2602->type = type;
        ssm2602->regmap = regmap;
 
        return snd_soc_register_codec(dev, &soc_codec_dev_ssm2602,