Merge branch 'v4.12/drivers' into davinci-reset