From: paul@pwsan.com (Paul Walmsley)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/11] OMAP4: prcm: Fix global warm reset bit position
Date: Tue, 21 Sep 2010 10:34:46 -0600 [thread overview]
Message-ID: <20100921163445.20258.92292.stgit@twilight.localdomain> (raw)
In-Reply-To: <20100921163021.20258.87587.stgit@twilight.localdomain>
From: Rajeev Kulkarni <rajeevk@ti.com>
OMAP4 platform has different register bits for Warm and Cold Resets.
Write one into appropriate bits.
Signed-off-by: Rajeev Kulkarni <rajeevk@ti.com>
Cc: Leed Aguilar <leed.aguilar@ti.com>
[b-cousson at ti.com: Change the define with the proper one from omap4 headers]
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/prcm.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index c201374..96f4616 100644
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -33,6 +33,7 @@
#include "cm.h"
#include "prm.h"
#include "prm-regbits-24xx.h"
+#include "prm-regbits-44xx.h"
static void __iomem *prm_base;
static void __iomem *cm_base;
@@ -161,8 +162,8 @@ void omap_prcm_arch_reset(char mode, const char *cmd)
prm_set_mod_reg_bits(OMAP_RST_DPLL3_MASK, prcm_offs,
OMAP2_RM_RSTCTRL);
if (cpu_is_omap44xx())
- prm_set_mod_reg_bits(OMAP_RST_DPLL3_MASK, prcm_offs,
- OMAP4_RM_RSTCTRL);
+ prm_set_mod_reg_bits(OMAP4430_RST_GLOBAL_WARM_SW_MASK,
+ prcm_offs, OMAP4_RM_RSTCTRL);
}
static inline u32 __omap_prcm_read(void __iomem *base, s16 module, u16 reg)
next prev parent reply other threads:[~2010-09-21 16:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-21 16:34 [PATCH 00/11] OMAP: hwmod: core patches for 2.6.37 Paul Walmsley
2010-09-21 16:34 ` [PATCH 01/11] OMAP: hwmod: Rename dma_ch to dma_req Paul Walmsley
2010-09-21 16:34 ` [PATCH 02/11] OMAP: hwmod: Do not disable clocks if hwmod already in idle Paul Walmsley
2010-09-21 16:34 ` [PATCH 03/11] OMAP: hwmod: Fix omap_hwmod_reset wrong state test Paul Walmsley
2010-09-21 16:34 ` Paul Walmsley [this message]
2010-09-21 16:34 ` [PATCH 05/11] [PATCH] OMAP: hwmod: separate list locking and hwmod hardware locking Paul Walmsley
2010-09-21 16:34 ` [PATCH 06/11] OMAP4: prcm: Add temporarily helper functions for rmw and read inside the PRM Paul Walmsley
2010-09-21 16:34 ` [PATCH 07/11] OMAP4: PRM: add module hard reset support Paul Walmsley
2010-09-21 16:34 ` [PATCH 08/11] OMAP2/3: " Paul Walmsley
2010-09-21 16:34 ` [PATCH 09/11] OMAP: hwmod: Add hardreset management support Paul Walmsley
2010-09-21 16:34 ` [PATCH 10/11] OMAP: hwmod: Force a softreset during _setup Paul Walmsley
2010-09-21 16:34 ` [PATCH 11/11] OMAP: hwmod: add an hardreset API for use by other core code Paul Walmsley
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=20100921163445.20258.92292.stgit@twilight.localdomain \
--to=paul@pwsan.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).