Commit f9f697a7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.11/mailbox-signed' of... 

Merge tag 'omap-for-v3.11/mailbox-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers

From Tony Lindgren:

Move OMAP Mailbox framework to drivers via Suman Anna <s-anna@ti.com>

The OMAP Mailbox driver framework is moved out of arch/arm folder
into drivers/mailbox folder, to re-enable building it and also serve
as a baseline for adapting to the new mailbox driver framework. The
changes mainly contain:
  - a minor bug fix and cleanup of mach-specific mailbox code
  - remove any header dependencies from plat-omap for multi-platform
    support
  - represent mailbox device data through platform data/hwmod attrs
  - move the omap mailbox code out of plat-omap/mach-omapX to
    drivers/mailbox folder

* tag 'omap-for-v3.11/mailbox-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  mailbox/omap: move the OMAP mailbox framework to drivers
  ARM: OMAP2+: add user and fifo info to mailbox platform data
  ARM: OMAP2+: mbox: remove dependencies with soc.h
  omap: mailbox: correct the argument type for irq ops
  omap: mailbox: call request_irq after mbox queues are allocated
  omap: mailbox: check iomem resource before dereferencing it

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8fe14e5a d2e99328

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

+10 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/pinctrl/machine.h>

#include <linux/platform_data/omap4-keypad.h>

#include <linux/platform_data/omap_ocp2scp.h>

#include <linux/platform_data/mailbox-omap.h>

#include <linux/usb/omap_control_usb.h>



#include <asm/mach-types.h>
@@ -327,25 +328,31 @@ 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;

	struct platform_device *pdev;

	struct omap_mbox_pdata *pdata;



	oh = omap_hwmod_lookup("mailbox");

	if (!oh) {

		pr_err("%s: unable to find hwmod\n", __func__);

		return;

	}

	if (!oh->dev_attr) {

		pr_err("%s: hwmod doesn't have valid attrs\n", __func__);

		return;

	}



	pdev = omap_device_build("omap-mailbox", -1, oh, NULL, 0);

	pdata = (struct omap_mbox_pdata *)oh->dev_attr;

	pdev = omap_device_build("omap-mailbox", -1, oh, pdata, sizeof(*pdata));

	WARN(IS_ERR(pdev), "%s: could not build device, err %ld\n",

						__func__, PTR_ERR(pdev));

}

#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/mach-omap2/omap_hwmod_2420_data.c

+14 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/i2c-omap.h>

#include <linux/platform_data/spi-omap2-mcspi.h>

#include <linux/omap-dma.h>

#include <linux/platform_data/mailbox-omap.h>

#include <plat/dmtimer.h>



#include "omap_hwmod.h"
@@ -166,6 +167,18 @@ static struct omap_hwmod omap2420_dma_system_hwmod = { 
};



/* mailbox */

static struct omap_mbox_dev_info omap2420_mailbox_info[] = {

	{ .name = "dsp", .tx_id = 0, .rx_id = 1, .irq_id = 0, .usr_id = 0 },

	{ .name = "iva", .tx_id = 2, .rx_id = 3, .irq_id = 1, .usr_id = 3 },

};



static struct omap_mbox_pdata omap2420_mailbox_attrs = {

	.num_users	= 4,

	.num_fifos	= 6,

	.info_cnt	= ARRAY_SIZE(omap2420_mailbox_info),

	.info		= omap2420_mailbox_info,

};



static struct omap_hwmod_irq_info omap2420_mailbox_irqs[] = {

	{ .name = "dsp", .irq = 26 + OMAP_INTC_START, },

	{ .name = "iva", .irq = 34 + OMAP_INTC_START, },
@@ -186,6 +199,7 @@ static struct omap_hwmod omap2420_mailbox_hwmod = { 
			.idlest_idle_bit = OMAP24XX_ST_MAILBOXES_SHIFT,

		},

	},

	.dev_attr	= &omap2420_mailbox_attrs,

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE