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