ASoC: Ease merge difficulties from new architectures

Rather than listing lots of architectures per line in Kconfig and
Makefile, causing merge conflicts all the time, have one per line
in alphabetical order.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --cc sound/soc/Kconfig
Simple merge

diff --cc sound/soc/Makefile
Simple merge