diff options
| author | Mark Brown <broonie@kernel.org> | 2016-09-26 09:32:22 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-26 09:32:22 -0700 |
| commit | 5c4341199b223a6973b7a18ed43d943a6a897685 (patch) | |
| tree | 9646add60c90efa8338ec11855b80d43fd4bf4e3 /sound/soc/codecs/rt5514.c | |
| parent | c1d5065a0bd09bac783120b73bfa768ba6a493d9 (diff) | |
| parent | 8180bd56bdd1dcade8d1b2a0b6f70b2397bec372 (diff) | |
| download | linux-5c4341199b223a6973b7a18ed43d943a6a897685.tar.gz linux-5c4341199b223a6973b7a18ed43d943a6a897685.tar.bz2 linux-5c4341199b223a6973b7a18ed43d943a6a897685.zip | |
Merge branch 'topic/codec-component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sunxi
Diffstat (limited to 'sound/soc/codecs/rt5514.c')
| -rw-r--r-- | sound/soc/codecs/rt5514.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c index 7162f05101d9..e0606a58da98 100644 --- a/sound/soc/codecs/rt5514.c +++ b/sound/soc/codecs/rt5514.c @@ -1023,12 +1023,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5514 = { .probe = rt5514_probe, .idle_bias_off = true, .set_bias_level = rt5514_set_bias_level, - .controls = rt5514_snd_controls, - .num_controls = ARRAY_SIZE(rt5514_snd_controls), - .dapm_widgets = rt5514_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(rt5514_dapm_widgets), - .dapm_routes = rt5514_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(rt5514_dapm_routes), + .component_driver = { + .controls = rt5514_snd_controls, + .num_controls = ARRAY_SIZE(rt5514_snd_controls), + .dapm_widgets = rt5514_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(rt5514_dapm_widgets), + .dapm_routes = rt5514_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(rt5514_dapm_routes), + }, }; static const struct regmap_config rt5514_i2c_regmap = { |