dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

omap: mailbox: only compile for configured archs 

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
This commit is contained in:
Felipe Contreras 2010-06-11 15:51:47 +00:00 committed by Hiroshi DOYU
parent 9c80c8cd74
commit 14476bd937
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/mach-omap2/mailbox.c
View File

@ -284,6 +284,7 @@ static struct omap_mbox_ops omap2_mbox_ops = {
/* FIXME: the following structs should be filled automatically by the user id */ /* FIXME: the following structs should be filled automatically by the user id */
#if defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_ARCH_OMAP2420)
/* DSP */ /* DSP */
static struct omap_mbox2_priv omap2_mbox_dsp_priv = { static struct omap_mbox2_priv omap2_mbox_dsp_priv = {
.tx_fifo = { .tx_fifo = {
@ -306,11 +307,13 @@ struct omap_mbox mbox_dsp_info = {
.ops = &omap2_mbox_ops, .ops = &omap2_mbox_ops,
.priv = &omap2_mbox_dsp_priv, .priv = &omap2_mbox_dsp_priv,
}; };
#endif
#if defined(CONFIG_ARCH_OMAP3430)
struct omap_mbox *omap3_mboxes[] = { &mbox_dsp_info, NULL }; struct omap_mbox *omap3_mboxes[] = { &mbox_dsp_info, NULL };
#endif
#if defined(CONFIG_ARCH_OMAP2420) #if defined(CONFIG_ARCH_OMAP2420)
/* IVA */ /* IVA */
static struct omap_mbox2_priv omap2_mbox_iva_priv = { static struct omap_mbox2_priv omap2_mbox_iva_priv = {
.tx_fifo = { .tx_fifo = {
@ -337,6 +340,7 @@ static struct omap_mbox mbox_iva_info = {
struct omap_mbox *omap2_mboxes[] = { &mbox_iva_info, &mbox_dsp_info, NULL }; struct omap_mbox *omap2_mboxes[] = { &mbox_iva_info, &mbox_dsp_info, NULL };
#endif #endif
#if defined(CONFIG_ARCH_OMAP4)
/* OMAP4 */ /* OMAP4 */
static struct omap_mbox2_priv omap2_mbox_1_priv = { static struct omap_mbox2_priv omap2_mbox_1_priv = {
.tx_fifo = { .tx_fifo = {
@ -383,6 +387,7 @@ struct omap_mbox mbox_2_info = {
}; };
struct omap_mbox *omap4_mboxes[] = { &mbox_1_info, &mbox_2_info, NULL }; struct omap_mbox *omap4_mboxes[] = { &mbox_1_info, &mbox_2_info, NULL };
#endif
static int __devinit omap2_mbox_probe(struct platform_device *pdev) static int __devinit omap2_mbox_probe(struct platform_device *pdev)
{ {
@ -390,11 +395,15 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
int ret; int ret;
struct omap_mbox **list; struct omap_mbox **list;
if (cpu_is_omap3430()) { if (false)
;
#if defined(CONFIG_ARCH_OMAP3430)
else if (cpu_is_omap3430()) {
list = omap3_mboxes; list = omap3_mboxes;
list[0]->irq = platform_get_irq_byname(pdev, "dsp"); list[0]->irq = platform_get_irq_byname(pdev, "dsp");
} }
#endif
#if defined(CONFIG_ARCH_OMAP2420) #if defined(CONFIG_ARCH_OMAP2420)
else if (cpu_is_omap2420()) { else if (cpu_is_omap2420()) {
list = omap2_mboxes; list = omap2_mboxes;
@ -403,12 +412,14 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
list[1]->irq = platform_get_irq_byname(pdev, "iva"); list[1]->irq = platform_get_irq_byname(pdev, "iva");
} }
#endif #endif
#if defined(CONFIG_ARCH_OMAP4)
else if (cpu_is_omap44xx()) { else if (cpu_is_omap44xx()) {
list = omap4_mboxes; list = omap4_mboxes;
list[0]->irq = list[1]->irq = list[0]->irq = list[1]->irq =
platform_get_irq_byname(pdev, "mbox"); platform_get_irq_byname(pdev, "mbox");
} }
#endif
else { else {
pr_err("%s: platform not supported\n", __func__); pr_err("%s: platform not supported\n", __func__);
return -ENODEV; return -ENODEV;