From: Felipe Contreras <felipe.contreras@gmail.com> To: linux-omap <linux-omap@vger.kernel.org> Cc: linux-arm <linux-arm-kernel@lists.infradead.org>, Hiroshi Doyu <hiroshi.doyu@nokia.com>, Tony Lindgren <tony@atomide.com>, Russell King <linux@arm.linux.org.uk>, Felipe Contreras <felipe.contreras@gmail.com> Subject: [PATCH v2 08/17] omap: mailbox: only compile for configured archs Date: Fri, 14 May 2010 18:01:41 +0300 [thread overview] Message-ID: <1273849310-32169-9-git-send-email-felipe.contreras@gmail.com> (raw) In-Reply-To: <1273849310-32169-1-git-send-email-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- arch/arm/mach-omap2/mailbox.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) 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; -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: felipe.contreras@gmail.com (Felipe Contreras) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 08/17] omap: mailbox: only compile for configured archs Date: Fri, 14 May 2010 18:01:41 +0300 [thread overview] Message-ID: <1273849310-32169-9-git-send-email-felipe.contreras@gmail.com> (raw) In-Reply-To: <1273849310-32169-1-git-send-email-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- arch/arm/mach-omap2/mailbox.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) 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; -- 1.7.1
next prev parent reply other threads:[~2010-05-14 15:02 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-05-14 15:01 [PATCH v2 00/17] omap: mailbox: reorganize init Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 01/17] omap: mailbox: trivial whitespace cleanups Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 02/17] omap: mailbox: trivial cleanups Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 03/17] omap: mailbox: reorganize structures Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 04/17] omap: mailbox: 2420 should be detected at run-time Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 05/17] omap: mailbox: use correct config for omap1 Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 06/17] omap: mailbox: update omap1 probing Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 07/17] omap: mailbox: reorganize registering Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras [this message] 2010-05-14 15:01 ` [PATCH v2 08/17] omap: mailbox: only compile for configured archs Felipe Contreras 2010-05-14 21:27 ` Kanigeri, Hari 2010-05-14 21:27 ` Kanigeri, Hari 2010-05-14 22:24 ` Felipe Contreras 2010-05-14 22:24 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 09/17] omap: mailbox: reorganize omap platform_device Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 10/17] omap: mailbox: move more stuff to omap_mbox_init() Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 11/17] omap: mailbox: trivial sync between omap1 and 2 Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 12/17] omap: mailbox: split platform driver Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 13/17] omap: mailbox: always built-in platform data Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 14/17] omap: mailbox: reorganize headers Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 15/17] omap: mailbox: don't export unecessary symbols Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 16/17] omap: mailbox: mark some resources as __initdata Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:01 ` [PATCH v2 17/17] omap: mailbox: don't export register/unregister Felipe Contreras 2010-05-14 15:01 ` Felipe Contreras 2010-05-14 15:09 ` [PATCH v2 00/17] omap: mailbox: reorganize init Ohad Ben-Cohen 2010-05-14 15:09 ` Ohad Ben-Cohen 2010-05-14 19:03 ` Felipe Contreras 2010-05-14 19:03 ` Felipe Contreras 2010-05-15 8:36 ` Ohad Ben-Cohen 2010-05-15 8:36 ` Ohad Ben-Cohen 2010-05-18 8:46 ` Hiroshi DOYU 2010-05-18 8:46 ` Hiroshi DOYU 2010-05-18 12:03 ` Felipe Contreras 2010-05-18 12:03 ` Felipe Contreras 2010-05-18 13:31 ` Hiroshi DOYU 2010-05-18 13:31 ` Hiroshi DOYU 2010-05-18 16:57 ` Felipe Contreras 2010-05-18 16:57 ` Felipe Contreras 2010-05-18 19:58 ` Hiroshi DOYU 2010-05-18 19:58 ` Hiroshi DOYU 2010-05-19 10:03 ` Felipe Contreras 2010-05-19 10:03 ` Felipe Contreras 2010-05-19 18:13 ` Tony Lindgren 2010-05-19 18:13 ` Tony Lindgren 2010-05-21 21:51 ` Felipe Contreras 2010-05-21 21:51 ` Felipe Contreras
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1273849310-32169-9-git-send-email-felipe.contreras@gmail.com \ --to=felipe.contreras@gmail.com \ --cc=hiroshi.doyu@nokia.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.