Commit 07d65d8b authored by Felipe Contreras's avatar Felipe Contreras Committed by Hiroshi DOYU
Browse files

omap: mailbox: reorganize structures 



OMAP4 ones messed up the organization.

Signed-off-by: default avatarFelipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: default avatarHiroshi DOYU <Hiroshi.DOYU@nokia.com>
parent 909f9dc7

arch/arm/mach-omap2/mailbox.c

+35 −33
Original line number Original line Diff line number Diff line
@@ -283,6 +283,7 @@ static struct omap_mbox_ops omap2_mbox_ops = { 
 */

 */





/* FIXME: the following structs should be filled automatically by the user id */

/* FIXME: the following structs should be filled automatically by the user id */



/* DSP */

/* DSP */

static struct omap_mbox2_priv omap2_mbox_dsp_priv = {

static struct omap_mbox2_priv omap2_mbox_dsp_priv = {

	.tx_fifo = {

	.tx_fifo = {
@@ -300,8 +301,40 @@ static struct omap_mbox2_priv omap2_mbox_dsp_priv = { 
	.irqdisable	= MAILBOX_IRQENABLE(0),

	.irqdisable	= MAILBOX_IRQENABLE(0),

};

};





/* OMAP4 specific data structure. Use the cpu_is_omap4xxx()

struct omap_mbox mbox_dsp_info = {

to use this*/

	.name	= "dsp",

	.ops	= &omap2_mbox_ops,

	.priv	= &omap2_mbox_dsp_priv,

};

EXPORT_SYMBOL(mbox_dsp_info);



#if defined(CONFIG_ARCH_OMAP2420)



/* IVA */

static struct omap_mbox2_priv omap2_mbox_iva_priv = {

	.tx_fifo = {

		.msg		= MAILBOX_MESSAGE(2),

		.fifo_stat	= MAILBOX_FIFOSTATUS(2),

	},

	.rx_fifo = {

		.msg		= MAILBOX_MESSAGE(3),

		.msg_stat	= MAILBOX_MSGSTATUS(3),

	},

	.irqenable	= MAILBOX_IRQENABLE(3),

	.irqstatus	= MAILBOX_IRQSTATUS(3),

	.notfull_bit	= MAILBOX_IRQ_NOTFULL(2),

	.newmsg_bit	= MAILBOX_IRQ_NEWMSG(3),

	.irqdisable	= MAILBOX_IRQENABLE(3),

};



static struct omap_mbox mbox_iva_info = {

	.name	= "iva",

	.ops	= &omap2_mbox_ops,

	.priv	= &omap2_mbox_iva_priv,

};

#endif



/* OMAP4 */

static struct omap_mbox2_priv omap2_mbox_1_priv = {

static struct omap_mbox2_priv omap2_mbox_1_priv = {

	.tx_fifo = {

	.tx_fifo = {

		.msg		= MAILBOX_MESSAGE(0),

		.msg		= MAILBOX_MESSAGE(0),
@@ -325,13 +358,6 @@ struct omap_mbox mbox_1_info = { 
};

};

EXPORT_SYMBOL(mbox_1_info);

EXPORT_SYMBOL(mbox_1_info);





struct omap_mbox mbox_dsp_info = {

	.name	= "dsp",

	.ops	= &omap2_mbox_ops,

	.priv	= &omap2_mbox_dsp_priv,

};

EXPORT_SYMBOL(mbox_dsp_info);



static struct omap_mbox2_priv omap2_mbox_2_priv = {

static struct omap_mbox2_priv omap2_mbox_2_priv = {

	.tx_fifo = {

	.tx_fifo = {

		.msg		= MAILBOX_MESSAGE(3),

		.msg		= MAILBOX_MESSAGE(3),
@@ -355,30 +381,6 @@ struct omap_mbox mbox_2_info = { 
};

};

EXPORT_SYMBOL(mbox_2_info);

EXPORT_SYMBOL(mbox_2_info);





#if defined(CONFIG_ARCH_OMAP2420) /* IVA */

static struct omap_mbox2_priv omap2_mbox_iva_priv = {

	.tx_fifo = {

		.msg		= MAILBOX_MESSAGE(2),

		.fifo_stat	= MAILBOX_FIFOSTATUS(2),

	},

	.rx_fifo = {

		.msg		= MAILBOX_MESSAGE(3),

		.msg_stat	= MAILBOX_MSGSTATUS(3),

	},

	.irqenable	= MAILBOX_IRQENABLE(3),

	.irqstatus	= MAILBOX_IRQSTATUS(3),

	.notfull_bit	= MAILBOX_IRQ_NOTFULL(2),

	.newmsg_bit	= MAILBOX_IRQ_NEWMSG(3),

	.irqdisable	= MAILBOX_IRQENABLE(3),

};



static struct omap_mbox mbox_iva_info = {

	.name	= "iva",

	.ops	= &omap2_mbox_ops,

	.priv	= &omap2_mbox_iva_priv,

};

#endif



static int __devinit omap2_mbox_probe(struct platform_device *pdev)

static int __devinit omap2_mbox_probe(struct platform_device *pdev)

{

{

	struct resource *res;

	struct resource *res;