From patchwork Fri Sep 24 03:41:05 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: omar ramirez <omar.ramirez@ti.com>
X-Patchwork-Id: 203502
X-Patchwork-Delegate: tony@atomide.com
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8O3od2Y015429
	for <patchwork-omap@patchwork.kernel.org>;
	Fri, 24 Sep 2010 03:50:40 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755237Ab0IXDui (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Thu, 23 Sep 2010 23:50:38 -0400
Received: from comal.ext.ti.com ([198.47.26.152]:52697 "EHLO
	comal.ext.ti.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754888Ab0IXDuh (ORCPT <rfc822;linux-omap@vger.kernel.org>);
	Thu, 23 Sep 2010 23:50:37 -0400
Received: from dlep34.itg.ti.com ([157.170.170.115])
	by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o8O3oMff017355
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 23 Sep 2010 22:50:22 -0500
Received: from legion.dal.design.ti.com (localhost [127.0.0.1])
	by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id o8O3oMFB008927;
	Thu, 23 Sep 2010 22:50:22 -0500 (CDT)
Received: from localhost (bacab.am.dhcp.ti.com [128.247.77.143])
	by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id
	o8O3oLf08168; Thu, 23 Sep 2010 22:50:21 -0500 (CDT)
From: Omar Ramirez Luna <omar.ramirez@ti.com>
To: Tony Lindgren <tony@atomide.com>
Cc: Omar Ramirez Luna <omar.ramirez@ti.com>, Tony Lindgren <tony@atomide.com>,
	Russell King <linux@arm.linux.org.uk>,
	Hiroshi DOYU <Hiroshi.DOYU@nokia.com>,
	Felipe Contreras <felipe.contreras@gmail.com>,
	Suman Anna <s-anna@ti.com>, Kevin Hilman <khilman@deeprootsystems.com>,
	linux-omap@vger.kernel.org
Subject: [PATCH 2/2] omap: mailbox: fix detection for previously supported
	chips
Date: Thu, 23 Sep 2010 22:41:05 -0500
Message-Id: <1285299665-21639-2-git-send-email-omar.ramirez@ti.com>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <1285299665-21639-1-git-send-email-omar.ramirez@ti.com>
References: <1285299665-21639-1-git-send-email-omar.ramirez@ti.com>
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Fri, 24 Sep 2010 03:50:40 +0000 (UTC)


diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 42dbfa4..26d6fb0 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -394,15 +394,19 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
 
 	if (false)
 		;
-#if defined(CONFIG_ARCH_OMAP3430)
-	else if (cpu_is_omap3430()) {
+#if defined(CONFIG_ARCH_OMAP3)
+	else if (omap3_has_iva()) {
 		list = omap3_mboxes;
 
 		list[0]->irq = platform_get_irq_byname(pdev, "dsp");
 	}
 #endif
-#if defined(CONFIG_ARCH_OMAP2420)
-	else if (cpu_is_omap2420()) {
+#if defined(CONFIG_ARCH_OMAP2)
+	else if (cpu_is_omap2430()) {
+		list = omap2_mboxes;
+
+		list[0]->irq = platform_get_irq_byname(pdev, "dsp");
+	} else if (cpu_is_omap2420()) {
 		list = omap2_mboxes;
 
 		list[0]->irq = platform_get_irq_byname(pdev, "dsp");