Re: [PATCH] ARM: OMAP2: fix mailbox init code

2012-02-23 Thread Ramirez Luna, Omar 
Hi,

On Thu, Feb 23, 2012 at 3:18 AM, Bedia, Vaibhav vaibhav.be...@ti.com wrote:
 On Thu, Feb 23, 2012 at 14:23:35, Ohad Ben-Cohen wrote:
 [...]

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

 [...]

 -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)

 Instead of adding more #ifs can they be completely removed please?

I'll rebase/repost this series:

[PATCH 0/7] OMAP: mailbox: removing static declarations
http://comments.gmane.org/gmane.linux.ports.arm.omap/59620

In the meantime I would appreciate comments.

Regards,

Omar
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: OMAP2: fix mailbox init code

2012-02-23 Thread Ohad Ben-Cohen 
On Thu, Feb 23, 2012 at 11:18 AM, Bedia, Vaibhav vaibhav.be...@ti.com wrote:
 Instead of adding more #ifs can they be completely removed please?

Care to propose something specific (which is viable for the -rc cycle) ?

Thanks,
Ohad.
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: OMAP2: fix mailbox init code

2012-02-23 Thread Tony Lindgren 
* Ohad Ben-Cohen o...@wizery.com [120223 08:32]:
 On Thu, Feb 23, 2012 at 11:18 AM, Bedia, Vaibhav vaibhav.be...@ti.com wrote:
  Instead of adding more #ifs can they be completely removed please?
 
 Care to propose something specific (which is viable for the -rc cycle) ?

This is pretty much the minimal change for -rc cycle so I'll apply
this into fixes.

Regards,

Tony
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] ARM: OMAP2: fix mailbox init code

2012-02-23 Thread Ohad Ben-Cohen 
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: Russell King li...@arm.linux.org.uk
Signed-off-by: Ohad Ben-Cohen o...@wizery.com
Cc: Tony Lindgren t...@atomide.com
Cc: Hiroshi Doyu hd...@nvidia.com
Cc: Omar Ramirez Luna omar.rami...@ti.com
---
 arch/arm/mach-omap2/mailbox.c |   10 +-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 609ea2d..415a6f1 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -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)
-- 
1.7.5.4

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH] ARM: OMAP2: fix mailbox init code

2012-02-23 Thread Bedia, Vaibhav 
On Thu, Feb 23, 2012 at 14:23:35, Ohad Ben-Cohen wrote:
[...]
 
 Which happens on CONFIG_ARCH_OMAP2  !CONFIG_SOC_OMAP2420, due to
 missing omap2_mboxes declaration.
 
[...]
  
 -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)

Instead of adding more #ifs can they be completely removed please?
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html