提交 cb555318 编写于 作者: M Mark Brown

ASoC: Use table based init for wm8731_snd_controls

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
上级 70a28f84
...@@ -553,9 +553,6 @@ static int wm8731_probe(struct snd_soc_codec *codec) ...@@ -553,9 +553,6 @@ static int wm8731_probe(struct snd_soc_codec *codec)
/* Disable bypass path by default */ /* Disable bypass path by default */
snd_soc_update_bits(codec, WM8731_APANA, 0x8, 0); snd_soc_update_bits(codec, WM8731_APANA, 0x8, 0);
snd_soc_add_controls(codec, wm8731_snd_controls,
ARRAY_SIZE(wm8731_snd_controls));
/* Regulators will have been enabled by bias management */ /* Regulators will have been enabled by bias management */
regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies); regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
...@@ -595,6 +592,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8731 = { ...@@ -595,6 +592,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8731 = {
.num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets), .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),
.dapm_routes = wm8731_intercon, .dapm_routes = wm8731_intercon,
.num_dapm_routes = ARRAY_SIZE(wm8731_intercon), .num_dapm_routes = ARRAY_SIZE(wm8731_intercon),
.controls = wm8731_snd_controls,
.num_controls = ARRAY_SIZE(wm8731_snd_controls),
}; };
static const struct of_device_id wm8731_of_match[] = { static const struct of_device_id wm8731_of_match[] = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册