ASoC: Merge up fixes