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