ASoC: adapt multi-componentism again