leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

omap: mailbox: correct OMAP4 reset logic

Browse Source 
OMAP4 mailbox has a different register set. There is
no MAILBOX_SYSSTATUS register. The reset is indicated
with the SOFTRESET bit of the MAILBOX_SYSCONFIG register
itself. This bit should read 0 for a successful Reset.
Also, the SOFTRESET bit occupies bit0 and not bit1 as with
previous generations.

Signed-off-by: Suman Anna <s-anna@ti.com>
Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Suman Anna 2010-01-26 16:55:29 -06:00 committed by Tony Lindgren
parent 5772ca7d78
commit a6a6022871
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@
#define AUTOIDLE (1 << 0) #define AUTOIDLE (1 << 0)
#define SOFTRESET (1 << 1) #define SOFTRESET (1 << 1)
#define SMARTIDLE (2 << 3) #define SMARTIDLE (2 << 3)
#define OMAP4_SOFTRESET (1 << 0)
/* SYSSTATUS: register bit definition */ /* SYSSTATUS: register bit definition */
#define RESETDONE (1 << 0) #define RESETDONE (1 << 0)
@ -99,17 +100,32 @@ static int omap2_mbox_startup(struct omap_mbox *mbox)
} }
clk_enable(mbox_ick_handle); clk_enable(mbox_ick_handle);
mbox_write_reg(SOFTRESET, MAILBOX_SYSCONFIG); if (cpu_is_omap44xx()) {
timeout = jiffies + msecs_to_jiffies(20); mbox_write_reg(OMAP4_SOFTRESET, MAILBOX_SYSCONFIG);
do { timeout = jiffies + msecs_to_jiffies(20);
l = mbox_read_reg(MAILBOX_SYSSTATUS); do {
if (l & RESETDONE) l = mbox_read_reg(MAILBOX_SYSCONFIG);
break; if (!(l & OMAP4_SOFTRESET))
} while (!time_after(jiffies, timeout)); break;
} while (!time_after(jiffies, timeout));
if (!(l & RESETDONE)) { if (l & OMAP4_SOFTRESET) {
pr_err("Can't take mmu out of reset\n"); pr_err("Can't take mailbox out of reset\n");
return -ENODEV; return -ENODEV;
}
} else {
mbox_write_reg(SOFTRESET, MAILBOX_SYSCONFIG);
timeout = jiffies + msecs_to_jiffies(20);
do {
l = mbox_read_reg(MAILBOX_SYSSTATUS);
if (l & RESETDONE)
break;
} while (!time_after(jiffies, timeout));
if (!(l & RESETDONE)) {
pr_err("Can't take mailbox out of reset\n");
return -ENODEV;
}
} }
l = mbox_read_reg(MAILBOX_REVISION); l = mbox_read_reg(MAILBOX_REVISION);