diff options
| author | Mark Brown <broonie@kernel.org> | 2017-06-13 23:57:18 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-06-13 23:57:18 +0300 |
| commit | 03cf603a49a82938b05d9b448938cd0a541ed374 (patch) | |
| tree | 8b3efaa30a6412bbf3807129cbf9986258810343 /include | |
| parent | 37fae57931e4fdd5c24ee13826b12e8e1a51d4e1 (diff) | |
| parent | a97a06c7efc1ee34f500171f1c4e9608295bb79a (diff) | |
| download | linux-03cf603a49a82938b05d9b448938cd0a541ed374.tar.xz | |
Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-of-graph
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/simple_card_utils.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index efab584af11b..108cae459ed0 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -35,13 +35,16 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card, char *prefix); #define asoc_simple_card_parse_clk_cpu(dev, node, dai_link, simple_dai) \ - asoc_simple_card_parse_clk(dev, node, dai_link->cpu_of_node, simple_dai) + asoc_simple_card_parse_clk(dev, node, dai_link->cpu_of_node, simple_dai, \ + dai_link->cpu_dai_name) #define asoc_simple_card_parse_clk_codec(dev, node, dai_link, simple_dai) \ - asoc_simple_card_parse_clk(dev, node, dai_link->codec_of_node, simple_dai) + asoc_simple_card_parse_clk(dev, node, dai_link->codec_of_node, simple_dai,\ + dai_link->codec_dai_name) int asoc_simple_card_parse_clk(struct device *dev, struct device_node *node, struct device_node *dai_of_node, - struct asoc_simple_dai *simple_dai); + struct asoc_simple_dai *simple_dai, + const char *name); #define asoc_simple_card_parse_cpu(node, dai_link, \ list_name, cells_name, is_single_link) \ |