[ARM] 2887/1: OMAP 2/4: Update files common to omap1 and omap2, take 2