Merge branch 'v4.16/soc' into davinci-reset