ASoC: core: Add extra dapm properties for Device Tree
authorNicolin Chen <nicoleotsuka@gmail.com>
Sun, 15 Feb 2015 01:22:49 +0000 (17:22 -0800)
committerMark Brown <broonie@kernel.org>
Tue, 24 Feb 2015 14:46:13 +0000 (23:46 +0900)
commitf23e860edbb3f2208c0ab3448e756689bb4a3760
tree586003f1bfa289b5f9342893839deb4324ca8cbf
parentc517d838eb7d07bbe9507871fab3931deccff539
ASoC: core: Add extra dapm properties for Device Tree

The current helper functions, snd_soc_of_parse_audio_simple_widgets()
and snd_soc_of_parse_audio_routing(), set dapm_widgets and dapm_routes
without caring if they are already set by using build-in widgets and
routes in the card driver. So there could be one of them, build-in one
or Device Tree one, overrided by the other depending on which one was
assigned later.

This patch adds an extra pair of dapm_widgets and dapm_routes for DT
use only so as to prevent unexpected overriding.

Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
include/sound/soc.h
sound/soc/soc-core.c