Merge branch '7xx-iosplit-plat' with omap-fixes