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