From patchwork Fri May 14 15:01:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 99631 X-Patchwork-Delegate: hiroshi.doyu@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4EF2MtH031810 for ; Fri, 14 May 2010 15:02:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755537Ab0ENPCV (ORCPT ); Fri, 14 May 2010 11:02:21 -0400 Received: from mail-ew0-f216.google.com ([209.85.219.216]:44846 "EHLO mail-ew0-f216.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755464Ab0ENPCT (ORCPT ); Fri, 14 May 2010 11:02:19 -0400 Received: by mail-ew0-f216.google.com with SMTP id 8so902320ewy.28 for ; Fri, 14 May 2010 08:02:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=6NznEwBSUdCoHhU7iGOb9IlQRPk8IeIRRlivHawtDPE=; b=BtDwlx7OU6fEttqYj0cFx9y5ULQB70IhQh2m17uiLKWiLPXmQcJaynW2NJXrSkRONt QDPHf2q6L+wP8aaS1P4KYINZzB9VrPaCBEKeOB4BJYUh39VxiR6jnxBQ9t5StH+rSgTs I0Lgo3Dqxp/BoW223dfeh4D5Fp5sBd0r0wZIA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=EWseU3VxX7PlkNGFi/F3PrI61n25dZbdHuRJDC37ZqWK9FtGG36MdZi3Xmdj8eI09Y hEANVxalYnsf/mjsigfgWDDJHabpwxx7jTSjyKiLOWE/bIU1E5J38CyEcejdTJC6f7eT TbQkf1OAS8KJHw5sCnuhytVGw7DXEUhYRtNys= Received: by 10.213.43.79 with SMTP id v15mr744884ebe.60.1273849338830; Fri, 14 May 2010 08:02:18 -0700 (PDT) Received: from localhost ([192.100.124.156]) by mx.google.com with ESMTPS id 13sm1310425ewy.9.2010.05.14.08.02.18 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 14 May 2010 08:02:18 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: linux-arm , Hiroshi Doyu , Tony Lindgren , Russell King , Felipe Contreras Subject: [PATCH v2 08/17] omap: mailbox: only compile for configured archs Date: Fri, 14 May 2010 18:01:41 +0300 Message-Id: <1273849310-32169-9-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1273849310-32169-1-git-send-email-felipe.contreras@gmail.com> References: <1273849310-32169-1-git-send-email-felipe.contreras@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 14 May 2010 15:02:22 +0000 (UTC) diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 5dda11c..04b70ba 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -286,6 +286,7 @@ static struct omap_mbox_ops omap2_mbox_ops = { /* FIXME: the following structs should be filled automatically by the user id */ +#if defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_ARCH_OMAP2420) /* DSP */ static struct omap_mbox2_priv omap2_mbox_dsp_priv = { .tx_fifo = { @@ -309,11 +310,13 @@ struct omap_mbox mbox_dsp_info = { .priv = &omap2_mbox_dsp_priv, }; EXPORT_SYMBOL(mbox_dsp_info); +#endif +#if defined(CONFIG_ARCH_OMAP3430) struct omap_mbox *omap3_mboxes[] = { &mbox_dsp_info, NULL }; +#endif #if defined(CONFIG_ARCH_OMAP2420) - /* IVA */ static struct omap_mbox2_priv omap2_mbox_iva_priv = { .tx_fifo = { @@ -340,6 +343,7 @@ static struct omap_mbox mbox_iva_info = { struct omap_mbox *omap2_mboxes[] = { &mbox_iva_info, &mbox_dsp_info, NULL }; #endif +#if defined(CONFIG_ARCH_OMAP4) /* OMAP4 */ static struct omap_mbox2_priv omap2_mbox_1_priv = { .tx_fifo = { @@ -388,6 +392,7 @@ struct omap_mbox mbox_2_info = { EXPORT_SYMBOL(mbox_2_info); struct omap_mbox *omap4_mboxes[] = { &mbox_1_info, &mbox_2_info, NULL }; +#endif static int __devinit omap2_mbox_probe(struct platform_device *pdev) { @@ -401,11 +406,14 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev) if (!mbox_base) return -ENOMEM; - if (cpu_is_omap3430()) { + if (false); +#if defined(CONFIG_ARCH_OMAP3430) + else if (cpu_is_omap3430()) { list = omap3_mboxes; list[0]->irq = res[1].start; } +#endif #if defined(CONFIG_ARCH_OMAP2420) else if (cpu_is_omap2420()) { list = omap2_mboxes; @@ -414,12 +422,14 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev) list[1]->irq = res[2].start; } #endif +#if defined(CONFIG_ARCH_OMAP4) else if (cpu_is_omap44xx()) { list = omap4_mboxes; list[0]->irq = res[1].start; list[1]->irq = res[1].start; } +#endif else { pr_err("%s: platform not supported\n", __func__); return -ENODEV;