Merge remote-tracking branch 'iommu/next'

[deliverable/linux.git] / sound / soc / codecs / cs47l24.c

diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c
index 954a4f5d3338c5c96b137296e16e10042e67795f..257b15233b7e3e7e76a25a3862e3eb08e7cc953c 100644 (file)
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@ -746,6 +746,16 @@ static const struct snd_soc_dapm_route cs47l24_dapm_routes[] = {
        { "IN2L", NULL, "SYSCLK" },
        { "IN2R", NULL, "SYSCLK" },
 
+       { "ASRC1L", NULL, "SYSCLK" },
+       { "ASRC1R", NULL, "SYSCLK" },
+       { "ASRC2L", NULL, "SYSCLK" },
+       { "ASRC2R", NULL, "SYSCLK" },
+
+       { "ASRC1L", NULL, "ASYNCCLK" },
+       { "ASRC1R", NULL, "ASYNCCLK" },
+       { "ASRC2L", NULL, "ASYNCCLK" },
+       { "ASRC2R", NULL, "ASYNCCLK" },
+
        { "MICBIAS1", NULL, "MICVDD" },
        { "MICBIAS2", NULL, "MICVDD" },
 
@@ -1190,12 +1200,14 @@ static struct snd_soc_codec_driver soc_codec_dev_cs47l24 = {
        .set_sysclk = arizona_set_sysclk,
        .set_pll = cs47l24_set_fll,
 
-       .controls = cs47l24_snd_controls,
-       .num_controls = ARRAY_SIZE(cs47l24_snd_controls),
-       .dapm_widgets = cs47l24_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(cs47l24_dapm_widgets),
-       .dapm_routes = cs47l24_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(cs47l24_dapm_routes),
+       .component_driver = {
+               .controls               = cs47l24_snd_controls,
+               .num_controls           = ARRAY_SIZE(cs47l24_snd_controls),
+               .dapm_widgets           = cs47l24_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(cs47l24_dapm_widgets),
+               .dapm_routes            = cs47l24_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(cs47l24_dapm_routes),
+       },
 };
 
 static struct snd_compr_ops cs47l24_compr_ops = {