Hi Mark
I'm posting these 2 series ASoC: merge audio-graph-scu into audio-graph ASoC: merge simple-scu-card into simple-card
This time, I merged these into this patch-set. Previous patch-set included "remove xx-suc-card" patch, too. But, I think postpone it to next version is more safety for us. So, I dropped it.
As you know, I and Tony discussed about DAI ID method. It is included to this patch-set, too
I post 3 series.
0*) for DAI ID fixup 1*) for merging audio-graph-scu to audio-graph 2*) for merging simple-card-scu to simple-card
Kuninori Morimoto (11): 01) ASoC: simple-card-utils: fixup asoc_simple_card_get_dai_id() ID method 11) ASoC: audio-graph-card: merge audio-graph-scu-card on Doc 12) ASoC: audio-graph-card: merge audio-graph-scu-card 13) ASoC: audio-graph-card: tidyup mclk-fs method 14) ASoC: audio-graph-card: tidyup convert_rate/channel method 15) ASoC: audio-graph-card: tidyup prefix for snd_soc_codec_conf 21) ASoC: simple-card: merge simple-scu-card on Doc 22) ASoC: simple-card: merge simple-scu-card 23) ASoC: simple-card: tidyup mclk-fs method 24) ASoC: simple-card: tidyup convert_rate/channel method 25) ASoC: simple-card: tidyup prefix for snd_soc_codec_conf
Documentation/devicetree/bindings/sound/audio-graph-card.txt | 205 ++++++++++++++++++++++++++++++++ Documentation/devicetree/bindings/sound/simple-card.txt | 137 +++++++++++++++++++++ sound/soc/generic/Kconfig | 2 + sound/soc/generic/audio-graph-card.c | 403 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------- sound/soc/generic/simple-card-utils.c | 32 ++++- sound/soc/generic/simple-card.c | 342 +++++++++++++++++++++++++++++++++++++++++++--------- 6 files changed, 1005 insertions(+), 116 deletions(-)