diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2018-04-27 13:54:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-04-27 19:23:59 +0100 |
| commit | b24c539b4dc58f7d6283b8d06e240ac87d4966d7 (patch) | |
| tree | 09cc794c74d679cf90f323e9292fc257f370443e /sound/soc/soc-core.c | |
| parent | 58edf3255ca3025444c016241611453585453089 (diff) | |
| download | lwn-b24c539b4dc58f7d6283b8d06e240ac87d4966d7.tar.gz lwn-b24c539b4dc58f7d6283b8d06e240ac87d4966d7.zip | |
ASoC: core: Allow codec_conf DT lookups to match parent of_node
For devices implemented as a MFD it is common to only have a single node
in devicetree representing the whole device. As such when looking up
codec_conf mappings we should match against both the devices of_node and
the devices parent's of_node, as is already done for DAIs and platform
components.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 052089f16ea0..4b068ccf4e13 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1383,7 +1383,12 @@ static void soc_set_name_prefix(struct snd_soc_card *card, for (i = 0; i < card->num_configs; i++) { struct snd_soc_codec_conf *map = &card->codec_conf[i]; - if (map->of_node && component->dev->of_node != map->of_node) + struct device_node *component_of_node = component->dev->of_node; + + if (!component_of_node && component->dev->parent) + component_of_node = component->dev->parent->of_node; + + if (map->of_node && component_of_node != map->of_node) continue; if (map->dev_name && strcmp(component->name, map->dev_name)) continue; |