Merge branch 'omap/cleanup2' into next/newsoc

Dependency for omap/minimal-omap5