Merge branch 'soc-fixes' into omap-for-v4.15/fixes