Merge remote-tracking branches 'asoc/topic/cs35l30', 'asoc/topic/cs42l73', 'asoc...

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

diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index f756220..12da558 100644 (file)
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1262,8 +1262,8 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
                return -EINVAL;
        }
 
-       /* By default only 32 BCLK per WCLK is supported */
-       dai_clk_mode |= DA7213_DAI_BCLKS_PER_WCLK_32;
+       /* By default only 64 BCLK per WCLK is supported */
+       dai_clk_mode |= DA7213_DAI_BCLKS_PER_WCLK_64;
 
        snd_soc_write(codec, DA7213_DAI_CLK_MODE, dai_clk_mode);
        snd_soc_update_bits(codec, DA7213_DAI_CTRL, DA7213_DAI_FORMAT_MASK,
@@ -1778,13 +1778,14 @@ static struct snd_soc_codec_driver soc_codec_dev_da7213 = {
        .probe                  = da7213_probe,
        .set_bias_level         = da7213_set_bias_level,
 
-       .controls               = da7213_snd_controls,
-       .num_controls           = ARRAY_SIZE(da7213_snd_controls),
-
-       .dapm_widgets           = da7213_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(da7213_dapm_widgets),
-       .dapm_routes            = da7213_audio_map,
-       .num_dapm_routes        = ARRAY_SIZE(da7213_audio_map),
+       .component_driver = {
+               .controls               = da7213_snd_controls,
+               .num_controls           = ARRAY_SIZE(da7213_snd_controls),
+               .dapm_widgets           = da7213_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(da7213_dapm_widgets),
+               .dapm_routes            = da7213_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(da7213_audio_map),
+       },
 };
 
 static const struct regmap_config da7213_regmap_config = {