Merge branch 'topic/simple' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rcar

1 files changed, 34 insertions, 0 deletions

diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index 86088aed9002..403ec92164fc 100644
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -33,4 +33,38 @@ int asoc_simple_card_set_dailink_name(struct device *dev,
 int asoc_simple_card_parse_card_name(struct snd_soc_card *card,
                                      char *prefix);
 
+#define asoc_simple_card_parse_clk_cpu(node, dai_link, simple_dai)              \
+        asoc_simple_card_parse_clk(node, dai_link->cpu_of_node, simple_dai)
+#define asoc_simple_card_parse_clk_codec(node, dai_link, simple_dai)            \
+        asoc_simple_card_parse_clk(node, dai_link->codec_of_node, simple_dai)
+int asoc_simple_card_parse_clk(struct device_node *node,
+                               struct device_node *dai_of_node,
+                               struct asoc_simple_dai *simple_dai);
+
+#define asoc_simple_card_parse_cpu(node, dai_link,                              \
+                                   list_name, cells_name, is_single_link)       \
+        asoc_simple_card_parse_dai(node, &dai_link->cpu_of_node,                \
+                &dai_link->cpu_dai_name, list_name, cells_name, is_single_link)
+#define asoc_simple_card_parse_codec(node, dai_link, list_name, cells_name)     \
+        asoc_simple_card_parse_dai(node, &dai_link->codec_of_node,              \
+                &dai_link->codec_dai_name, list_name, cells_name, NULL)
+#define asoc_simple_card_parse_platform(node, dai_link, list_name, cells_name)  \
+        asoc_simple_card_parse_dai(node, &dai_link->platform_of_node,           \
+                NULL, list_name, cells_name, NULL)
+int asoc_simple_card_parse_dai(struct device_node *node,
+                                  struct device_node **endpoint_np,
+                                  const char **dai_name,
+                                  const char *list_name,
+                                  const char *cells_name,
+                                  int *is_single_links);
+
+int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
+                              struct asoc_simple_dai *simple_dai);
+
+int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link);
+void asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
+                                      int is_single_links);
+
+int asoc_simple_card_clean_reference(struct snd_soc_card *card);
+
 #endif /* __SIMPLE_CARD_CORE_H */