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