From: Santosh Shilimkar <santosh.shilimkar@ti.com>
To: linux-omap@vger.kernel.org
Cc: tony@atomide.com, linux-arm-kernel@lists.infradead.org,
Santosh Shilimkar <santosh.shilimkar@ti.com>
Subject: [PATCH 5/8] ARM: OMAP5: Update SAR RAM base address
Date: Wed, 20 Feb 2013 20:57:11 +0530 [thread overview]
Message-ID: <1361374034-21831-6-git-send-email-santosh.shilimkar@ti.com> (raw)
In-Reply-To: <1361374034-21831-1-git-send-email-santosh.shilimkar@ti.com>
Update SAR RAM base address for OMAP5 based devices.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
arch/arm/mach-omap2/omap4-common.c | 10 ++++++++--
arch/arm/mach-omap2/omap54xx.h | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index 6897ae2..59399f8 100644
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -239,15 +239,21 @@ void __iomem *omap4_get_sar_ram_base(void)
*/
static int __init omap4_sar_ram_init(void)
{
+ unsigned long sar_base;
+
/*
* To avoid code running on other OMAPs in
* multi-omap builds
*/
- if (!cpu_is_omap44xx())
+ if (cpu_is_omap44xx())
+ sar_base = OMAP44XX_SAR_RAM_BASE;
+ else if (soc_is_omap54xx())
+ sar_base = OMAP54XX_SAR_RAM_BASE;
+ else
return -ENOMEM;
/* Static mapping, never released */
- sar_ram_base = ioremap(OMAP44XX_SAR_RAM_BASE, SZ_16K);
+ sar_ram_base = ioremap(sar_base, SZ_16K);
if (WARN_ON(!sar_ram_base))
return -ENOMEM;
diff --git a/arch/arm/mach-omap2/omap54xx.h b/arch/arm/mach-omap2/omap54xx.h
index a2582bb..a086ba1 100644
--- a/arch/arm/mach-omap2/omap54xx.h
+++ b/arch/arm/mach-omap2/omap54xx.h
@@ -28,5 +28,6 @@
#define OMAP54XX_PRCM_MPU_BASE 0x48243000
#define OMAP54XX_SCM_BASE 0x4a002000
#define OMAP54XX_CTRL_BASE 0x4a002800
+#define OMAP54XX_SAR_RAM_BASE 0x4ae26000
#endif /* __ASM_SOC_OMAP555554XX_H */
--
1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: santosh.shilimkar@ti.com (Santosh Shilimkar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/8] ARM: OMAP5: Update SAR RAM base address
Date: Wed, 20 Feb 2013 20:57:11 +0530 [thread overview]
Message-ID: <1361374034-21831-6-git-send-email-santosh.shilimkar@ti.com> (raw)
In-Reply-To: <1361374034-21831-1-git-send-email-santosh.shilimkar@ti.com>
Update SAR RAM base address for OMAP5 based devices.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
arch/arm/mach-omap2/omap4-common.c | 10 ++++++++--
arch/arm/mach-omap2/omap54xx.h | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index 6897ae2..59399f8 100644
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -239,15 +239,21 @@ void __iomem *omap4_get_sar_ram_base(void)
*/
static int __init omap4_sar_ram_init(void)
{
+ unsigned long sar_base;
+
/*
* To avoid code running on other OMAPs in
* multi-omap builds
*/
- if (!cpu_is_omap44xx())
+ if (cpu_is_omap44xx())
+ sar_base = OMAP44XX_SAR_RAM_BASE;
+ else if (soc_is_omap54xx())
+ sar_base = OMAP54XX_SAR_RAM_BASE;
+ else
return -ENOMEM;
/* Static mapping, never released */
- sar_ram_base = ioremap(OMAP44XX_SAR_RAM_BASE, SZ_16K);
+ sar_ram_base = ioremap(sar_base, SZ_16K);
if (WARN_ON(!sar_ram_base))
return -ENOMEM;
diff --git a/arch/arm/mach-omap2/omap54xx.h b/arch/arm/mach-omap2/omap54xx.h
index a2582bb..a086ba1 100644
--- a/arch/arm/mach-omap2/omap54xx.h
+++ b/arch/arm/mach-omap2/omap54xx.h
@@ -28,5 +28,6 @@
#define OMAP54XX_PRCM_MPU_BASE 0x48243000
#define OMAP54XX_SCM_BASE 0x4a002000
#define OMAP54XX_CTRL_BASE 0x4a002800
+#define OMAP54XX_SAR_RAM_BASE 0x4ae26000
#endif /* __ASM_SOC_OMAP555554XX_H */
--
1.7.9.5
next prev parent reply other threads:[~2013-02-20 15:26 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 15:27 [PATCH 0/8] ARM: OMAP5: Few updates discovered with es2.0 Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 1/8] ARM: OMAP5: Update SOC id detection code for ES2 Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:29 ` Felipe Balbi
2013-02-20 15:29 ` Felipe Balbi
2013-02-20 16:03 ` Santosh Shilimkar
2013-02-20 16:03 ` Santosh Shilimkar
2013-02-20 16:27 ` Felipe Balbi
2013-02-20 16:27 ` Felipe Balbi
2013-02-20 16:31 ` Santosh Shilimkar
2013-02-20 16:31 ` Santosh Shilimkar
2013-02-20 16:32 ` Felipe Balbi
2013-02-20 16:32 ` Felipe Balbi
2013-02-20 15:27 ` [PATCH 2/8] ARM: OMAP5: timer: Update the clocksource name as per clock data Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-21 12:52 ` Sergei Shtylyov
2013-02-21 12:52 ` Sergei Shtylyov
2013-02-21 12:57 ` Santosh Shilimkar
2013-02-21 12:57 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 3/8] ARM: OMAP5: prm: Allow prm init to success on OMAP5 SOCs Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:30 ` Felipe Balbi
2013-02-20 15:30 ` Felipe Balbi
2013-02-21 12:50 ` Sergei Shtylyov
2013-02-21 12:50 ` Sergei Shtylyov
2013-02-20 15:27 ` [PATCH 4/8] ARM: OMAP5: Reuse prm read_inst/write_inst Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar [this message]
2013-02-20 15:27 ` [PATCH 5/8] ARM: OMAP5: Update SAR RAM base address Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 6/8] ARM: OMAP5: Update SAR memory layout for WakeupGen Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 7/8] ARM: OMAP5: Make errata i688 workaround available Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 8/8] ARM: OMAP5: clock: No Freqsel on OMAP5 devices Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-03-15 8:39 ` Santosh Shilimkar
2013-03-15 8:39 ` Santosh Shilimkar
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=1361374034-21831-6-git-send-email-santosh.shilimkar@ti.com \
--to=santosh.shilimkar@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.