Merge remote-tracking branch 'mailbox/dbx500-prcmu-mailbox'

diff --cc arch/arm/configs/omap1_defconfig
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/omap_hwmod_2420_data.c
Simple merge

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

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

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

diff --cc drivers/remoteproc/Kconfig
index d4d377c40ec96585126f474238040d47c9e79c2e,2465c71ae70517536bd98789fa5591e63d4f9a71..ce1743d0b6793ab1e7fcd85352b6918cce27773a
--- 1/drivers/remoteproc/Kconfig
--- 2/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@@ -12,10 -10,11 +12,11 @@@ config REMOTEPRO
  config OMAP_REMOTEPROC
        tristate "OMAP remoteproc support"
        depends on HAS_DMA
 -      depends on ARCH_OMAP4
 +      depends on ARCH_OMAP4 || SOC_OMAP5
        depends on OMAP_IOMMU
-       depends on OMAP_MBOX_FWK
        select REMOTEPROC
+       select MAILBOX
+       select OMAP2PLUS_MBOX
        select RPMSG
        help
          Say y here to support OMAP's remote processors (dual M3