Merge branch 'omap-for-v4.1/ocp2scp' into omap-for-v4.1/fixes-not-urgent