Merge branch 'omap-for-v4.13/legacy-v2' into omap-for-v4.13/soc-v3