* [PATCH] ARM: OMAP: Warm reset functionality for 34xx
@ 2007-11-07 9:11 Choraria, Rohit
2007-11-15 21:27 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: Choraria, Rohit @ 2007-11-07 9:11 UTC (permalink / raw)
To: linux-omap-open-source
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);
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] ARM: OMAP: Warm reset functionality for 34xx
2007-11-07 9:11 [PATCH] ARM: OMAP: Warm reset functionality for 34xx Choraria, Rohit
@ 2007-11-15 21:27 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2007-11-15 21:27 UTC (permalink / raw)
To: Choraria, Rohit; +Cc: linux-omap-open-source
* 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-11-15 21:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-07 9:11 [PATCH] ARM: OMAP: Warm reset functionality for 34xx Choraria, Rohit
2007-11-15 21:27 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox