diff options
| author | Suman Anna <s-anna@ti.com> | 2010-02-05 17:20:26 -0600 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-23 15:29:22 -0800 |
| commit | 4499ce42935db68debba0a2d2ab8280627e4b692 (patch) | |
| tree | a7fe397ba5d7e3b5f62cd92d669bbb5e758d477a /arch/arm/mach-omap2/mailbox.c | |
| parent | a6a6022871b83ff31c34495709f53e3faef80976 (diff) | |
| download | op-kernel-dev-4499ce42935db68debba0a2d2ab8280627e4b692.zip op-kernel-dev-4499ce42935db68debba0a2d2ab8280627e4b692.tar.gz | |
omap: mailbox: correct OMAP4 SIDLEMODE logic
OMAP4 mailbox has a different MAILBOX_SYSCONFIG register.
There is now no AutoIdle. The SIDLEMODE bits have been
right-shifted by 1 bit and now occupy bits 2 & 3.
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>
Diffstat (limited to 'arch/arm/mach-omap2/mailbox.c')
| -rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 6519716..52a981c 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -41,6 +41,8 @@ #define SOFTRESET (1 << 1) #define SMARTIDLE (2 << 3) #define OMAP4_SOFTRESET (1 << 0) +#define OMAP4_NOIDLE (1 << 2) +#define OMAP4_SMARTIDLE (2 << 2) /* SYSSTATUS: register bit definition */ #define RESETDONE (1 << 0) @@ -131,7 +133,10 @@ static int omap2_mbox_startup(struct omap_mbox *mbox) l = mbox_read_reg(MAILBOX_REVISION); pr_info("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4, (l & 0x0f)); - l = SMARTIDLE | AUTOIDLE; + if (cpu_is_omap44xx()) + l = OMAP4_SMARTIDLE; + else + l = SMARTIDLE | AUTOIDLE; mbox_write_reg(l, MAILBOX_SYSCONFIG); omap2_mbox_enable_irq(mbox, IRQ_RX); |
