Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ak4104', 'asoc/topic...

[linux-2.6-block.git] / sound / soc / codecs / ak4104.c

diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c
index 595d02d7602c9f53aff29d6c86e7af1923109360..1a9d233c94d00f68f47fdc4313759666559140eb 100644 (file)
--- a/sound/soc/codecs/ak4104.c
+++ b/sound/soc/codecs/ak4104.c
@@ -163,7 +163,10 @@ static struct snd_soc_dai_driver ak4104_dai = {
                .stream_name = "Playback",
                .channels_min = 2,
                .channels_max = 2,
-               .rates = SNDRV_PCM_RATE_8000_192000,
+               .rates = SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 |
+                        SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
+                        SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 |
+                        SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000,
                .formats = SNDRV_PCM_FMTBIT_S16_LE  |
                           SNDRV_PCM_FMTBIT_S24_3LE |
                           SNDRV_PCM_FMTBIT_S24_LE
@@ -245,10 +248,12 @@ static struct snd_soc_codec_driver soc_codec_device_ak4104 = {
        .suspend = ak4104_soc_suspend,
        .resume = ak4104_soc_resume,
 
-       .dapm_widgets = ak4104_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ak4104_dapm_widgets),
-       .dapm_routes = ak4104_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(ak4104_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = ak4104_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ak4104_dapm_widgets),
+               .dapm_routes            = ak4104_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(ak4104_dapm_routes),
+       }
 };
 
 static const struct regmap_config ak4104_regmap = {