public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: "Choraria, Rohit" <rohitkc@ti.com>
Cc: linux-omap-open-source@linux.omap.com
Subject: Re: [PATCH] ARM: OMAP: Warm reset functionality for 34xx
Date: Thu, 15 Nov 2007 13:27:18 -0800	[thread overview]
Message-ID: <20071115212717.GN20686@atomide.com> (raw)
In-Reply-To: <AC2D475575504148943F5EB0938951C4011252AA@dbde01.ent.ti.com>

* Choraria, Rohit <rohitkc@ti.com> [071107 01:13]:
> Hi,
> This patch adds the implementation for warm reset functionality for OMAP3.
> 
> Regards,
> Rohit
> 
> Signed-off-by: Rohit Choraria <rohitkc@ti.com>
> ---
>  arch/arm/mach-omap2/prcm.c         |   11 +++++++++--
>  include/asm-arm/arch-omap/system.h |    2 +-
>  2 files changed, 10 insertions(+), 3 deletions(-)
> 
> Index: linux-omap-git-20071030/arch/arm/mach-omap2/prcm.c
> ===================================================================
> --- linux-omap-git-20071030.orig/arch/arm/mach-omap2/prcm.c	2007-10-30 12:38:14.000000000 -0400
> +++ linux-omap-git-20071030/arch/arm/mach-omap2/prcm.c	2007-11-06 13:22:07.892612648 -0500
> @@ -33,6 +33,13 @@
>  {
>  	u32 wkup;
>  	omap2_clk_prepare_for_reboot();
> -	wkup = prm_read_mod_reg(WKUP_MOD, RM_RSTCTRL) | OMAP_RST_DPLL3;
> -	prm_write_mod_reg(wkup, WKUP_MOD, RM_RSTCTRL);
> +
> +	if (cpu_is_omap24xx()) {
> +		wkup = prm_read_mod_reg(WKUP_MOD, RM_RSTCTRL) | OMAP_RST_DPLL3;
> +		prm_write_mod_reg(wkup, WKUP_MOD, RM_RSTCTRL);
> +	} else if (cpu_is_omap34xx()) {
> +		wkup = prm_read_mod_reg(OMAP3430_GR_MOD, RM_RSTCTRL)
> +							| OMAP_RST_DPLL3;
> +		prm_write_mod_reg(wkup, OMAP3430_GR_MOD, RM_RSTCTRL);
> +	}
>  }
> Index: linux-omap-git-20071030/include/asm-arm/arch-omap/system.h
> ===================================================================
> --- linux-omap-git-20071030.orig/include/asm-arm/arch-omap/system.h	2007-10-30 12:42:49.000000000 -0400
> +++ linux-omap-git-20071030/include/asm-arm/arch-omap/system.h	2007-11-06 13:21:57.893132800 -0500
> @@ -40,7 +40,7 @@
>  
>  static inline void arch_reset(char mode)
>  {
> -	if (!cpu_is_omap24xx())
> +	if (!cpu_class_is_omap2())
>  		omap1_arch_reset(mode);
>  	else
>  		omap_prcm_arch_reset(mode);

Pushing today.

Tony

      reply	other threads:[~2007-11-15 21:27 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-07  9:11 [PATCH] ARM: OMAP: Warm reset functionality for 34xx Choraria, Rohit
2007-11-15 21:27 ` Tony Lindgren [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071115212717.GN20686@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-omap-open-source@linux.omap.com \
    --cc=rohitkc@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox