From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 11 Jun 2010 15:51:39 +0000 (+0000)
Subject: omap: mailbox: 2420 should be detected at run-time
X-Git-Tag: firefly_0821_release~9833^2~1223^2^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7b2729a15bd512180706340d9b1bf3e63fe009bf;p=firefly-linux-kernel-4.4.55.git

omap: mailbox: 2420 should be detected at run-time

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
---

diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index edcfec6ff67b..f67cb2ce35b0 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -455,7 +455,8 @@ err_dsp:
 static int __devexit omap2_mbox_remove(struct platform_device *pdev)
 {
 #if defined(CONFIG_ARCH_OMAP2420)
-	omap_mbox_unregister(&mbox_iva_info);
+	if (cpu_is_omap2420())
+		omap_mbox_unregister(&mbox_iva_info);
 #endif
 
 	if (cpu_is_omap44xx()) {