Hi Mark
These are rebase version patches for parse_clk / parse_dai on simple utiles. I think today's topic/simple is missing [1/7] patch, but have [2/7] [3/7]. Because of this, it has bulid error, and you can't apply [4/7].
These patches add new functions on utils.c, and I noticed that it will have conflict with fix/simple branch. Because of these reasons, I think you want to redo topic/simple branch (?). These patches are based on fix/simple branch.
Kuninori Morimoto (7): ASoC: simple-card-utils: add asoc_simple_card_parse_clk() ASoC: simple-card: use asoc_simple_card_parse_clk() ASoC: rsrc-card: use asoc_simple_card_parse_clk() ASoC: simple-card-utils: add asoc_simple_card_parse_dai() ASoC: simple-card: use asoc_simple_card_parse_dai() ASoC: rsrc-card: use asoc_simple_card_parse_dai() ASoC: simple-card: remove asoc_simple_card_sub_parse_of()
include/sound/simple_card_utils.h | 25 ++++++++ sound/soc/generic/simple-card-utils.c | 69 ++++++++++++++++++++ sound/soc/generic/simple-card.c | 116 ++++++++++------------------------ sound/soc/sh/rcar/rsrc-card.c | 93 ++++++--------------------- 4 files changed, 146 insertions(+), 157 deletions(-)