Commit 559d40d0 authored by Hari Kanigeri's avatar Hari Kanigeri

ARM: mailbox configuration bug

The mailbox is configured twice because the mailbox
get is called twice. This patch fixes this issue
by having a check to configure it only once.
Signed-off-by: default avatarHari Kanigeri <h-kanigeri2@ti.com>
parent cd4080bd
...@@ -70,6 +70,7 @@ struct omap_mbox2_priv { ...@@ -70,6 +70,7 @@ struct omap_mbox2_priv {
}; };
static struct clk *mbox_ick_handle; static struct clk *mbox_ick_handle;
static int mbox_configured;
static void omap2_mbox_enable_irq(struct omap_mbox *mbox, static void omap2_mbox_enable_irq(struct omap_mbox *mbox,
omap_mbox_type_t irq); omap_mbox_type_t irq);
...@@ -88,37 +89,45 @@ static inline void mbox_write_reg(u32 val, size_t ofs) ...@@ -88,37 +89,45 @@ static inline void mbox_write_reg(u32 val, size_t ofs)
static int omap2_mbox_startup(struct omap_mbox *mbox) static int omap2_mbox_startup(struct omap_mbox *mbox)
{ {
unsigned int l; unsigned int l;
if (!mbox_configured) {
if (!cpu_is_omap44xx()) { if (!cpu_is_omap44xx()) {
mbox_ick_handle = clk_get(NULL, "mailboxes_ick"); mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
if (IS_ERR(mbox_ick_handle)) { if (IS_ERR(mbox_ick_handle)) {
printk(KERN_ERR "Could not get mailboxes_ick\n"); printk(KERN_ERR "Could not get"
"mailboxes_ick\n");
return -ENODEV; return -ENODEV;
} }
clk_enable(mbox_ick_handle); clk_enable(mbox_ick_handle);
} }
l = mbox_read_reg(MAILBOX_REVISION); l = mbox_read_reg(MAILBOX_REVISION);
pr_info("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4, (l & 0x0f)); pr_info("omap mailbox rev %d.%d\n",
(l & 0xf0) >> 4, (l & 0x0f));
/* set smart-idle & autoidle */ /* set smart-idle & autoidle */
l = mbox_read_reg(MAILBOX_SYSCONFIG); l = mbox_read_reg(MAILBOX_SYSCONFIG);
l |= 0x00000011; l |= 0x00000011;
mbox_write_reg(l, MAILBOX_SYSCONFIG); mbox_write_reg(l, MAILBOX_SYSCONFIG);
}
mbox_configured++;
omap2_mbox_enable_irq(mbox, IRQ_RX); omap2_mbox_enable_irq(mbox, IRQ_RX);
return 0; return 0;
} }
static void omap2_mbox_shutdown(struct omap_mbox *mbox) static void omap2_mbox_shutdown(struct omap_mbox *mbox)
{ { if (mbox_configured > 0)
mbox_configured--;
if (!cpu_is_omap44xx()) { if (!cpu_is_omap44xx()) {
if (!mbox_configured) {
clk_disable(mbox_ick_handle); clk_disable(mbox_ick_handle);
clk_put(mbox_ick_handle); clk_put(mbox_ick_handle);
mbox_ick_handle = NULL;
}
} else { } else {
printk(KERN_ERR "OMAP4 clocks are not modeled"); printk(KERN_ERR "OMAP4 clocks are not modeled");
} }
} }
/* Mailbox FIFO handle functions */ /* Mailbox FIFO handle functions */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment