From: Rajendra Nayak <rnayak@ti.com>
To: linux-omap@vger.kernel.org
Cc: khilman@deeprootsystems.com, paul@pwsan.com, b-cousson@ti.com,
Rajendra Nayak <rnayak@ti.com>
Subject: [RFC][PATCH 1/2] OMAP4: PRCM: Add prcm_mpu_base to omap_globals
Date: Tue, 10 Aug 2010 20:32:55 +0530 [thread overview]
Message-ID: <1281452576-5705-2-git-send-email-rnayak@ti.com> (raw)
In-Reply-To: <1281452576-5705-1-git-send-email-rnayak@ti.com>
OMAP4 has a local PRCM (for individual CPU control) block.
Hence add a new prcm_mpu_base to handle this in the omap_globals
structure.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Benoit Cousson <b-cousson@ti.com>
---
arch/arm/mach-omap2/prcm.c | 5 +++++
arch/arm/plat-omap/common.c | 1 +
arch/arm/plat-omap/include/plat/common.h | 1 +
3 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index c201374..4df30d0 100644
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -35,6 +35,7 @@
#include "prm-regbits-24xx.h"
static void __iomem *prm_base;
+static void __iomem *prcm_mpu_base;
static void __iomem *cm_base;
static void __iomem *cm2_base;
@@ -282,6 +283,10 @@ void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals)
prm_base = ioremap(omap2_globals->prm, SZ_8K);
WARN_ON(!prm_base);
}
+ if (omap2_globals->prcm_mpu) {
+ prcm_mpu_base = ioremap(omap2_globals->prcm_mpu, SZ_8K);
+ WARN_ON(!prcm_mpu_base);
+ }
if (omap2_globals->cm) {
cm_base = ioremap(omap2_globals->cm, SZ_8K);
WARN_ON(!cm_base);
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 3008e71..8603a46 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -338,6 +338,7 @@ static struct omap_globals omap4_globals = {
.tap = OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),
.ctrl = OMAP443X_CTRL_BASE,
.prm = OMAP4430_PRM_BASE,
+ .prcm_mpu = OMAP4430_PRCM_MPU_BASE,
.cm = OMAP4430_CM_BASE,
.cm2 = OMAP4430_CM2_BASE,
.uart1_phys = OMAP4_UART1_BASE,
diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h
index 9776b41..47baf9d 100644
--- a/arch/arm/plat-omap/include/plat/common.h
+++ b/arch/arm/plat-omap/include/plat/common.h
@@ -48,6 +48,7 @@ struct omap_globals {
unsigned long sms; /* SDRAM Memory Scheduler */
unsigned long ctrl; /* System Control Module */
unsigned long prm; /* Power and Reset Management */
+ unsigned long prcm_mpu; /* Local MPU PRM */
unsigned long cm; /* Clock Management */
unsigned long cm2;
unsigned long uart1_phys;
--
1.7.0.4
next prev parent reply other threads:[~2010-08-10 15:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-10 15:02 [RFC][PATCH 0/2] Fix prm/cm accessor api's usage on OMAP4 Rajendra Nayak
2010-08-10 15:02 ` Rajendra Nayak [this message]
2010-08-10 15:02 ` [RFC][PATCH 2/2] OMAP4: PRCM: Fix usage of prm/cm accessor api's for OMAP4 Rajendra Nayak
2010-08-24 21:39 ` Kevin Hilman
2010-08-25 8:56 ` Nayak, Rajendra
2010-08-25 18:16 ` Kevin Hilman
2010-09-23 14:15 ` Nayak, Rajendra
2010-10-14 18:44 ` Paul Walmsley
2010-10-15 16:07 ` Cousson, Benoit
2010-10-18 22:52 ` Tony Lindgren
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=1281452576-5705-2-git-send-email-rnayak@ti.com \
--to=rnayak@ti.com \
--cc=b-cousson@ti.com \
--cc=khilman@deeprootsystems.com \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.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;
as well as URLs for NNTP newsgroup(s).