Commit c869c75c authored by Suman Anna's avatar Suman Anna
Browse files

mailbox/omap: move the OMAP mailbox framework to drivers 



The mailbox hardware (in OMAP) uses a queued mailbox interrupt
mechanism that provides a communication channel between processors
through a set of registers and their associated interrupt signals
by sending and receiving messages.

The OMAP mailbox framework/driver code is moved to be under
drivers/mailbox, in preparation for adapting to a common mailbox
driver framework. This allows the build for OMAP mailbox to be
enabled (it was disabled during the multi-platform support).

As part of the migration from plat and mach code:
- Kconfig symbols have been renamed to build OMAP1 or OMAP2+ drivers.
- mailbox.h under plat-omap/plat/include has been split into a public
  and private header files. The public header has only the API related
  functions and types.
- The module name mailbox.ko from plat-omap is changed to
  omap-mailbox.ko
- The module name mailbox_mach.ko from mach-omapX is changed as
    mailbox_omap1.ko for OMAP1
    mailbox_omap2.ko for OMAP2+

Cc: Tony Lindgren <tony@atomide.com>
[gregkh@linuxfoundation.org: ack for staging part]
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarOmar Ramirez Luna <omar.ramirez@copitl.com>
Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
parent fe32c1f6

arch/arm/configs/omap1_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ CONFIG_ARCH_OMAP=y 
CONFIG_ARCH_OMAP1=y

CONFIG_OMAP_RESET_CLOCKS=y

# CONFIG_OMAP_MUX is not set

CONFIG_OMAP_MBOX_FWK=y

CONFIG_MAILBOX=y

CONFIG_OMAP1_MBOX=y

CONFIG_OMAP_32K_TIMER=y

CONFIG_OMAP_DM_TIMER=y

CONFIG_ARCH_OMAP730=y

arch/arm/mach-omap1/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o 
# Power Management

obj-$(CONFIG_PM) += pm.o sleep.o



# DSP

obj-$(CONFIG_OMAP_MBOX_FWK)	+= mailbox_mach.o

mailbox_mach-objs		:= mailbox.o



i2c-omap-$(CONFIG_I2C_OMAP)		:= i2c.o

obj-y					+= $(i2c-omap-m) $(i2c-omap-y)

arch/arm/mach-omap2/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -203,9 +203,6 @@ obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o 
obj-$(CONFIG_OMAP3_EMU)			+= emu.o

obj-$(CONFIG_HW_PERF_EVENTS)		+= pmu.o



obj-$(CONFIG_OMAP_MBOX_FWK)		+= mailbox_mach.o

mailbox_mach-objs			:= mailbox.o



iommu-$(CONFIG_OMAP_IOMMU)		:= omap-iommu.o

obj-y					+= $(iommu-m) $(iommu-y)

arch/arm/mach-omap2/devices.c

+2 −2
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ int __init omap4_keyboard_init(struct omap4_keypad_platform_data 
	return 0;

}



#if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE)

#if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE)

static inline void __init omap_init_mbox(void)

{

	struct omap_hwmod *oh;
@@ -352,7 +352,7 @@ static inline void __init omap_init_mbox(void) 
}

#else

static inline void omap_init_mbox(void) { }

#endif /* CONFIG_OMAP_MBOX_FWK */

#endif /* CONFIG_OMAP2PLUS_MBOX */



static inline void omap_init_sti(void) {}

arch/arm/plat-omap/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -86,22 +86,6 @@ config OMAP_MUX_WARNINGS 
	  to change the pin multiplexing setup.	 When there are no warnings

	  printed, it's safe to deselect OMAP_MUX for your product.



config OMAP_MBOX_FWK

	tristate "Mailbox framework support"

	depends on ARCH_OMAP && !ARCH_MULTIPLATFORM

	help

	  Say Y here if you want to use OMAP Mailbox framework support for

	  DSP, IVA1.0 and IVA2 in OMAP1/2/3.



config OMAP_MBOX_KFIFO_SIZE

	int "Mailbox kfifo default buffer size (bytes)"

	depends on OMAP_MBOX_FWK

	default 256

	help

	  Specify the default size of mailbox's kfifo buffers (bytes).

	  This can also be changed at runtime (via the mbox_kfifo_size

	  module parameter).



config OMAP_IOMMU_IVA2

	bool

CRA Git | Maintained and supported by SUSTech CRA and CCSE