ASoC: Merge up fixes

Merge the fixes branch up so we can apply further AMD work.