Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 655850ed authored by Ohad Ben-Cohen's avatar Ohad Ben-Cohen Committed by Tony Lindgren
Browse files

ARM: OMAP2: fix mailbox init code 



Fix this:

arch/arm/mach-omap2/mailbox.c: In function 'omap2_mbox_probe':
arch/arm/mach-omap2/mailbox.c:354: error: 'omap2_mboxes' undeclared (first use in this function)
arch/arm/mach-omap2/mailbox.c:354: error: (Each undeclared identifier is reported only once
arch/arm/mach-omap2/mailbox.c:354: error: for each function it appears in.)

Which happens on CONFIG_ARCH_OMAP2 && !CONFIG_SOC_OMAP2420, due to
missing omap2_mboxes declaration.

In addition, make sure we declare the right mailbox instances for 2430.

Reported-by: default avatarRussell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
Cc: Hiroshi Doyu <hdoyu@nvidia.com>
Cc: Omar Ramirez Luna <omar.ramirez@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e4b0b2cb

arch/arm/mach-omap2/mailbox.c

+9 −1
Original line number Diff line number Diff line
@@ -281,8 +281,16 @@ static struct omap_mbox mbox_iva_info = { 
	.ops	= &omap2_mbox_ops,

	.priv	= &omap2_mbox_iva_priv,

};

#endif



struct omap_mbox *omap2_mboxes[] = { &mbox_dsp_info, &mbox_iva_info, NULL };

#ifdef CONFIG_ARCH_OMAP2

struct omap_mbox *omap2_mboxes[] = {

	&mbox_dsp_info,

#ifdef CONFIG_SOC_OMAP2420

	&mbox_iva_info,

#endif

	NULL

};

#endif



#if defined(CONFIG_ARCH_OMAP4)