diff options
| author | Mark Brown <broonie@kernel.org> | 2016-09-26 18:32:22 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-26 18:32:22 +0200 |
| commit | 5c4341199b223a6973b7a18ed43d943a6a897685 (patch) | |
| tree | 9646add60c90efa8338ec11855b80d43fd4bf4e3 /sound/soc/sunxi | |
| parent | ASoC: sun4i-codec: Add custom regmap configs (diff) | |
| parent | ASoC: cq93vc: duplicated callback function goes to component (diff) | |
| download | linux-5c4341199b223a6973b7a18ed43d943a6a897685.tar.xz 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/sunxi')
| -rw-r--r-- | sound/soc/sunxi/sun4i-codec.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index eb6808842208..e51f363ff786 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -628,12 +628,14 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = { }; static struct snd_soc_codec_driver sun4i_codec_codec = { - .controls = sun4i_codec_widgets, - .num_controls = ARRAY_SIZE(sun4i_codec_widgets), - .dapm_widgets = sun4i_codec_codec_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(sun4i_codec_codec_dapm_widgets), - .dapm_routes = sun4i_codec_codec_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(sun4i_codec_codec_dapm_routes), + .component_driver = { + .controls = sun4i_codec_widgets, + .num_controls = ARRAY_SIZE(sun4i_codec_widgets), + .dapm_widgets = sun4i_codec_codec_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(sun4i_codec_codec_dapm_widgets), + .dapm_routes = sun4i_codec_codec_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(sun4i_codec_codec_dapm_routes), + }, }; static const struct snd_soc_component_driver sun4i_codec_component = { |