Merge remote-tracking branch 'asoc/fix/rt5640' into asoc-linus