diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2017-09-04 16:41:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-09-19 15:57:56 +0100 |
| commit | 9e3f9f36a6f40bb6ba9b3844d709314121e4c106 (patch) | |
| tree | c711b1d47efdbe03f169ef86e7ea51c3cbc59a5f /sound/soc/codecs/wm8997.c | |
| parent | 2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e (diff) | |
| download | linux-9e3f9f36a6f40bb6ba9b3844d709314121e4c106.tar.bz2 | |
ASoC: arizona: Add new common Arizona init function
Currently the driver has quite a few small initialisation functions, in
preparation for some refactoring add a new function arizona_init_common.
This will be used bus probe level initialisation that is common across
Arizona devices. For now just move the notifier chain initialisation in
there.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/wm8997.c')
| -rw-r--r-- | sound/soc/codecs/wm8997.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c index 49401a8aae64..91c3c3e052d1 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -1068,8 +1068,6 @@ static int wm8997_codec_probe(struct snd_soc_codec *codec) if (ret < 0) return ret; - arizona_init_notifiers(codec); - snd_soc_component_disable_pin(component, "HAPTICS"); priv->core.arizona->dapm = dapm; @@ -1168,6 +1166,8 @@ static int wm8997_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); pm_runtime_idle(&pdev->dev); + arizona_init_common(arizona); + ret = arizona_init_spk_irqs(arizona); if (ret < 0) return ret; |