OMAP: Upstream Patch ups

Signed-off-by: Locasto <amperific@gmail.com>