ASoC: Ease merge difficulties from new architectures