diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2017-09-04 16:41:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-09-19 15:57:59 +0100 |
| commit | 0a229b15d99e0a9761f9672f4ff7efeb18ce0ea1 (patch) | |
| tree | 081b95808e20da9f428f107382c15cc1681c64cc /sound/soc/codecs/wm8997.c | |
| parent | 9e3f9f36a6f40bb6ba9b3844d709314121e4c106 (diff) | |
| download | op-kernel-dev-0a229b15d99e0a9761f9672f4ff7efeb18ce0ea1.zip op-kernel-dev-0a229b15d99e0a9761f9672f4ff7efeb18ce0ea1.tar.gz | |
ASoC: arizona: Add handling for audio related device tree entries
Currently all the audio related device tree entries are handled by the
MFD code, for most parts of the Arizona driver we group the device
tree handling with the component that uses it and should do so here as
well.
Add handling in the ASoC code for the audio device tree entries, a
later patch removes the MFD side handling but there is no harm in it
being duplicated temporarily.
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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c index 91c3c3e..c5aef9e 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -1134,6 +1134,14 @@ static int wm8997_probe(struct platform_device *pdev) return -ENOMEM; platform_set_drvdata(pdev, wm8997); + if (IS_ENABLED(CONFIG_OF)) { + if (!dev_get_platdata(arizona->dev)) { + ret = arizona_of_get_audio_pdata(arizona); + if (ret < 0) + return ret; + } + } + wm8997->core.arizona = arizona; wm8997->core.num_inputs = 4; |
