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/cs35l33.c | |
parent | c1d5065a0bd09bac783120b73bfa768ba6a493d9 (diff) | |
parent | 8180bd56bdd1dcade8d1b2a0b6f70b2397bec372 (diff) |
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/cs35l33.c')
-rw-r--r-- | sound/soc/codecs/cs35l33.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sound/soc/codecs/cs35l33.c b/sound/soc/codecs/cs35l33.c index 6f9c1addcd7f..6df29fa30fb9 100644 --- a/sound/soc/codecs/cs35l33.c +++ b/sound/soc/codecs/cs35l33.c @@ -837,13 +837,14 @@ static struct snd_soc_codec_driver soc_codec_dev_cs35l33 = { .set_bias_level = cs35l33_set_bias_level, .set_sysclk = cs35l33_codec_set_sysclk, - .dapm_widgets = cs35l33_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(cs35l33_dapm_widgets), - .dapm_routes = cs35l33_audio_map, - .num_dapm_routes = ARRAY_SIZE(cs35l33_audio_map), - .controls = cs35l33_snd_controls, - .num_controls = ARRAY_SIZE(cs35l33_snd_controls), - + .component_driver = { + .controls = cs35l33_snd_controls, + .num_controls = ARRAY_SIZE(cs35l33_snd_controls), + .dapm_widgets = cs35l33_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cs35l33_dapm_widgets), + .dapm_routes = cs35l33_audio_map, + .num_dapm_routes = ARRAY_SIZE(cs35l33_audio_map), + }, .idle_bias_off = true, }; |