Merge remote-tracking branch 'sound-asoc/for-next'

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

diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c
index 3a5c896a2d138f3fd9c7294786e5663373c10231..bcc2e1060a6c3ce1e48fce7ea2780249830e6525 100644 (file)
--- a/sound/soc/codecs/wm8998.c
+++ b/sound/soc/codecs/wm8998.c
@@ -966,6 +966,16 @@ static const struct snd_soc_dapm_route wm8998_dapm_routes[] = {
        { "IN2A", NULL, "SYSCLK" },
        { "IN2B", 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" },
+
        { "SPD1", NULL, "SYSCLK" },
        { "SPD1", NULL, "SPD1TX1" },
        { "SPD1", NULL, "SPD1TX2" },
@@ -1351,7 +1361,7 @@ static struct regmap *wm8998_get_regmap(struct device *dev)
        return priv->core.arizona->regmap;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8998 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8998 = {
        .probe = wm8998_codec_probe,
        .remove = wm8998_codec_remove,
        .get_regmap = wm8998_get_regmap,
@@ -1361,12 +1371,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8998 = {
        .set_sysclk = arizona_set_sysclk,
        .set_pll = wm8998_set_fll,
 
-       .controls = wm8998_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8998_snd_controls),
-       .dapm_widgets = wm8998_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8998_dapm_widgets),
-       .dapm_routes = wm8998_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8998_dapm_routes),
+       .component_driver = {
+               .controls               = wm8998_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8998_snd_controls),
+               .dapm_widgets           = wm8998_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8998_dapm_widgets),
+               .dapm_routes            = wm8998_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8998_dapm_routes),
+       },
 };
 
 static int wm8998_probe(struct platform_device *pdev)