| Message ID | 87h9bmmjj2.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jul 19, 2016 at 02:54:25AM +0000, Kuninori Morimoto wrote: > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > simple-card needs to get its dai name and endpoint node. > This patch makes it simple style standard This doesn't apply against current code, please check and resend.
Hi Mark > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > > > simple-card needs to get its dai name and endpoint node. > > This patch makes it simple style standard > > This doesn't apply against current code, please check and resend. Thank you. But it seems you are missing [1/7] patch, but applied [2/7], [3/7] patches. This is the reason why current topic/simple branch has build error, and you couldn't apply [4/7] patch. [PATCH 1/7] ASoC: simple-card-utils: add asoc_simple_card_parse_clk()
Hi Mark, again > > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > > > > > simple-card needs to get its dai name and endpoint node. > > > This patch makes it simple style standard > > > > This doesn't apply against current code, please check and resend. > > Thank you. But it seems you are missing [1/7] patch, but > applied [2/7], [3/7] patches. > This is the reason why current topic/simple branch has build error, > and you couldn't apply [4/7] patch. > > [PATCH 1/7] ASoC: simple-card-utils: add asoc_simple_card_parse_clk() I noticed that These patches + fix/simple + topic/simple will have conflict. I think we want to avoid conflict, so, I will repost these patches. It will be based on fix/simple + topic/simple.
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 1392eb5..62b3926 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -41,4 +41,21 @@ 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); + #endif /* __SIMPLE_CARD_CORE_H */ diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 2d1aab7..5aec0c0 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -127,3 +127,40 @@ int asoc_simple_card_parse_clk(struct device_node *node, return 0; } EXPORT_SYMBOL_GPL(asoc_simple_card_parse_clk); + +int asoc_simple_card_parse_dai(struct device_node *node, + struct device_node **dai_of_node, + const char **dai_name, + const char *list_name, + const char *cells_name, + int *is_single_link) +{ + struct of_phandle_args args; + int ret; + + if (!node) + return 0; + + /* + * Get node via "sound-dai = <&phandle port>" + * it will be used as xxx_of_node on soc_bind_dai_link() + */ + ret = of_parse_phandle_with_args(node, list_name, cells_name, 0, &args); + if (ret) + return ret; + + /* Get dai->name */ + if (dai_name) { + ret = snd_soc_of_get_dai_name(node, dai_name); + if (ret < 0) + return ret; + } + + *dai_of_node = args.np; + + if (is_single_link) + *is_single_link = !args.args_count; + + return 0; +} +EXPORT_SYMBOL_GPL(asoc_simple_card_parse_dai);