Merge remote-tracking branches 'asoc/topic/rt5659', 'asoc/topic/rt5660', 'asoc/topic...

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

diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index 0e7aba1..abc802a 100644 (file)
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -4667,7 +4667,7 @@ static int rt5677_to_irq(struct gpio_chip *chip, unsigned offset)
        return regmap_irq_get_virq(data, irq);
 }
 
-static struct gpio_chip rt5677_template_chip = {
+static const struct gpio_chip rt5677_template_chip = {
        .label                  = "rt5677",
        .owner                  = THIS_MODULE,
        .direction_output       = rt5677_gpio_direction_out,
@@ -4984,12 +4984,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5677 = {
        .resume = rt5677_resume,
        .set_bias_level = rt5677_set_bias_level,
        .idle_bias_off = true,
-       .controls = rt5677_snd_controls,
-       .num_controls = ARRAY_SIZE(rt5677_snd_controls),
-       .dapm_widgets = rt5677_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(rt5677_dapm_widgets),
-       .dapm_routes = rt5677_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(rt5677_dapm_routes),
+       .component_driver = {
+               .controls               = rt5677_snd_controls,
+               .num_controls           = ARRAY_SIZE(rt5677_snd_controls),
+               .dapm_widgets           = rt5677_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(rt5677_dapm_widgets),
+               .dapm_routes            = rt5677_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(rt5677_dapm_routes),
+       },
 };
 
 static const struct regmap_config rt5677_regmap_physical = {