> -----Original Message-----
> From: [email protected]
> [mailto:[email protected]] On Behalf Of Anna,
> Suman
> Sent: Friday, February 19, 2010 2:37 AM
> To: [email protected]
> Cc: [email protected]; Clark, Rob; Kanigeri, Hari; C.A, Subramaniam
> Subject: [PATCH 2/5] omap: mailbox: correct OMAP4 reset logic
>
> From 2488815a9facca29e2da3ddd279de441a5de6a58 Mon Sep 17 00:00:00 2001
> From: Suman Anna <[email protected]>
> Date: Tue, 26 Jan 2010 16:55:29 -0600
> Subject: [PATCH 2/5] omap: mailbox: correct OMAP4 reset logic
>
> 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 <[email protected]>
> ---
> arch/arm/mach-omap2/mailbox.c | 38 +++++++++++++++++++++++++++-----------
> 1 files changed, 27 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
> index c970cf6..88e9043 100644
> --- a/arch/arm/mach-omap2/mailbox.c
> +++ b/arch/arm/mach-omap2/mailbox.c
> @@ -40,6 +40,7 @@
> #define AUTOIDLE (1 << 0)
> #define SOFTRESET (1 << 1)
> #define SMARTIDLE (2 << 3)
> +#define OMAP4_SOFTRESET (1 << 0)
>
> /* SYSSTATUS: register bit definition */
> #define RESETDONE (1 << 0)
> @@ -99,17 +100,32 @@ static int omap2_mbox_startup(struct omap_mbox *mbox)
> }
> clk_enable(mbox_ick_handle);
>
> - 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 mmu out of reset\n");
> - return -ENODEV;
> + if (cpu_is_omap44xx()) {
Not so strong opinion but can we make use of mailbox ip revision instead
of cpu_is_xxxx() check.
> + mbox_write_reg(OMAP4_SOFTRESET, MAILBOX_SYSCONFIG);
> + timeout = jiffies + msecs_to_jiffies(20);
> + do {
> + l = mbox_read_reg(MAILBOX_SYSCONFIG);
> + if (!(l & OMAP4_SOFTRESET))
> + break;
> + } while (!time_after(jiffies, timeout));
> +
> + if (l & OMAP4_SOFTRESET) {
> + pr_err("Can't take mailbox out of reset\n");
> + 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);
> --
> 1.6.6.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
