From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tony Lindgren <tony@atomide.com>
Subject: Re: [PATCH] ARM: OMAP: Warm reset functionality for 34xx
Date: Thu, 15 Nov 2007 13:27:18 -0800
Message-ID: <20071115212717.GN20686@atomide.com>
References: <AC2D475575504148943F5EB0938951C4011252AA@dbde01.ent.ti.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-omap-open-source-bounces@linux.omap.com>
Content-Disposition: inline
In-Reply-To: <AC2D475575504148943F5EB0938951C4011252AA@dbde01.ent.ti.com>
List-Unsubscribe: <http://linux.omap.com/mailman/listinfo/linux-omap-open-source>,
	<mailto:linux-omap-open-source-request@linux.omap.com?subject=unsubscribe>
List-Archive: <http://linux.omap.com/pipermail/linux-omap-open-source>
List-Post: <mailto:linux-omap-open-source@linux.omap.com>
List-Help: <mailto:linux-omap-open-source-request@linux.omap.com?subject=help>
List-Subscribe: <http://linux.omap.com/mailman/listinfo/linux-omap-open-source>,
	<mailto:linux-omap-open-source-request@linux.omap.com?subject=subscribe>
Sender: linux-omap-open-source-bounces@linux.omap.com
Errors-To: linux-omap-open-source-bounces@linux.omap.com
To: "Choraria, Rohit" <rohitkc@ti.com>
Cc: linux-omap-open-source@linux.omap.com
List-Id: linux-omap@vger.kernel.org

* 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