[GIT PULL] ASoC fixes for v6.5-merge-window