diff options
| author | Vincent Stehlé <v-stehle@ti.com> | 2012-05-09 17:44:38 +0200 |
|---|---|---|
| committer | Vincent Stehlé <v-stehle@ti.com> | 2012-05-09 17:44:38 +0200 |
| commit | 7ee3bd35c453b95f6acf5a0864287c9fb3808a50 (patch) | |
| tree | 7187c805cc9e45cc6b91439464dae1975cfa7845 | |
| parent | 88fcf8be771ceed82cd24e5ebfc88e309dd7a996 (diff) | |
omap: Use omap4 mailbox for omap5VINCENT/5432-VIDEO-1
Signed-off-by: Vincent Stehlé <v-stehle@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index f727034216a..7fd9fe4d61a 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -139,7 +139,7 @@ static void omap2_mbox_disable_irq(struct omap_mbox *mbox, struct omap_mbox2_priv *p = mbox->priv; u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit; - if (!cpu_is_omap44xx()) + if (!(cpu_is_omap44xx() || cpu_is_omap54xx())) bit = mbox_read_reg(p->irqdisable) & ~bit; mbox_write_reg(bit, p->irqdisable); @@ -173,7 +173,7 @@ static void omap2_mbox_save_ctx(struct omap_mbox *mbox) int i; struct omap_mbox2_priv *p = mbox->priv; int nr_regs; - if (cpu_is_omap44xx()) + if (cpu_is_omap44xx() || cpu_is_omap54xx()) nr_regs = OMAP4_MBOX_NR_REGS; else nr_regs = MBOX_NR_REGS; @@ -190,7 +190,7 @@ static void omap2_mbox_restore_ctx(struct omap_mbox *mbox) int i; struct omap_mbox2_priv *p = mbox->priv; int nr_regs; - if (cpu_is_omap44xx()) + if (cpu_is_omap44xx() || cpu_is_omap54xx()) nr_regs = OMAP4_MBOX_NR_REGS; else nr_regs = MBOX_NR_REGS; @@ -291,7 +291,7 @@ struct omap_mbox *omap2_mboxes[] = { }; #endif -#if defined(CONFIG_ARCH_OMAP4) +#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_OMAP5) /* OMAP4 */ static struct omap_mbox2_priv omap2_mbox_1_priv = { .tx_fifo = { @@ -367,8 +367,8 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev) list[1]->irq = platform_get_irq_byname(pdev, "iva"); } #endif -#if defined(CONFIG_ARCH_OMAP4) - else if (cpu_is_omap44xx()) { +#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_OMAP5) + else if (cpu_is_omap44xx() || cpu_is_omap54xx()) { list = omap4_mboxes; list[0]->irq = list[1]->irq = platform_get_irq(pdev, 0); |