[PATCH 03/14] ASoC: simple-card-utils: setup dai_props cpu_dai/codec_dai at initial timing

[Mark Brown]

On Thu, Apr 01, 2021 at 01:15:43PM +0900, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
> 
> We couldn't setup dai_props cpu_dai/codec_dai at the initial timing,
> because "counting DAIs loop" and "detecting DAIs loop" were different.
> But we can do it now, because these are using same loops.

This doesn't reply against current code, please check and resend:

Applying: ASoC: simple-card-utils: setup dai_props cpu_dai/codec_dai at initial timing
Using index info to reconstruct a base tree...
M	sound/soc/generic/audio-graph-card.c
M	sound/soc/generic/simple-card.c
Falling back to patching base and 3-way merge...
Auto-merging sound/soc/generic/simple-card.c
Auto-merging sound/soc/generic/audio-graph-card.c
CONFLICT (content): Merge conflict in sound/soc/generic/audio-graph-card.c
error: Failed to merge in the changes.
Patch failed at 0003 ASoC: simple-card-utils: setup dai_props cpu_dai/codec_dai at initial timing
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://mailman.alsa-project.org/pipermail/alsa-devel/attachments/20210408/4fa8fe54/attachment.sig>