ARM: OMAP: Sync core code with linux-omap

This patch syncs omap specific core code with linux-omap.
Most of the changes are needed to fix bitrot caused by
driver updates in linux-omap tree.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --cc arch/arm/mach-omap1/Kconfig
Simple merge

diff --cc arch/arm/mach-omap1/Makefile
Simple merge

diff --cc arch/arm/mach-omap1/devices.c
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc arch/arm/mach-omap2/gpmc.c
Simple merge

diff --cc arch/arm/mach-omap2/io.c
Simple merge

diff --cc arch/arm/plat-omap/Kconfig
Simple merge

diff --cc arch/arm/plat-omap/Makefile
Simple merge

diff --cc arch/arm/plat-omap/common.c
Simple merge

diff --cc arch/arm/plat-omap/devices.c
Simple merge

diff --cc arch/arm/plat-omap/dmtimer.c
Simple merge

diff --cc arch/arm/plat-omap/fb.c
Simple merge

diff --cc arch/arm/plat-omap/sram.c
Simple merge

diff --cc arch/arm/plat-omap/usb.c
Simple merge