From: Paul Walmsley <paul@pwsan.com>
To: linux-omap-open-source@linux.omap.com
Subject: [PATCH 2/5] omap2: use OMAP2_32KSYNCT_BASE in place of OMAP24XX_32KSYNCT_BASE
Date: Mon, 21 May 2007 16:59:25 -0600 [thread overview]
Message-ID: <20070521230014.635898932@pwsan.com> (raw)
In-Reply-To: 20070521225923.223790635@pwsan.com
[-- Attachment #1: 0002-omap2-use-OMAP2_32KSYNCT_BASE-in-place-of-OMAP24XX_.patch --]
[-- Type: text/plain, Size: 3201 bytes --]
Change users of OMAP24XX_32KSYNCT_BASE to use OMAP2_32KSYNCT_BASE, in
preparation to remove OMAP24XX_32KSYNCT_BASE. Convert the 32K sync timer
reference in pm.c to use a symbolic constant rather than a magic number.
Remove the OMAP24XX_32KSYNCT_BASE define.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/pm.c | 2 +-
arch/arm/mach-omap2/sram-fn.S | 2 +-
arch/arm/plat-omap/common.c | 2 +-
arch/arm/plat-omap/timer32k.c | 2 +-
include/asm-arm/arch-omap/omap24xx.h | 1 -
5 files changed, 4 insertions(+), 5 deletions(-)
Index: linux-omap/arch/arm/mach-omap2/pm.c
===================================================================
--- linux-omap.orig/arch/arm/mach-omap2/pm.c
+++ linux-omap/arch/arm/mach-omap2/pm.c
@@ -158,7 +158,7 @@ static inline u32 prcm_read_reg(int idx)
static u32 omap2_read_32k_sync_counter(void)
{
- return omap_readl(0x48004010);
+ return omap_readl(OMAP2_32KSYNCT_BASE + 0x0010);
}
#ifdef CONFIG_PM_DEBUG
Index: linux-omap/arch/arm/mach-omap2/sram-fn.S
===================================================================
--- linux-omap.orig/arch/arm/mach-omap2/sram-fn.S
+++ linux-omap/arch/arm/mach-omap2/sram-fn.S
@@ -29,7 +29,7 @@
#include "prcm-regs.h"
-#define TIMER_32KSYNCT_CR_V IO_ADDRESS(OMAP24XX_32KSYNCT_BASE + 0x010)
+#define TIMER_32KSYNCT_CR_V IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010)
#define CM_CLKSEL2_PLL_V IO_ADDRESS(OMAP24XX_PRCM_BASE + 0x544)
#define PRCM_VOLTCTRL_V IO_ADDRESS(OMAP24XX_PRCM_BASE + 0x050)
Index: linux-omap/arch/arm/plat-omap/common.c
===================================================================
--- linux-omap.orig/arch/arm/plat-omap/common.c
+++ linux-omap/arch/arm/plat-omap/common.c
@@ -192,7 +192,7 @@ console_initcall(omap_add_serial_console
#if defined(CONFIG_ARCH_OMAP16XX)
#define TIMER_32K_SYNCHRONIZED 0xfffbc410
#elif defined(CONFIG_ARCH_OMAP24XX)
-#define TIMER_32K_SYNCHRONIZED (OMAP24XX_32KSYNCT_BASE + 0x10)
+#define TIMER_32K_SYNCHRONIZED (OMAP2_32KSYNCT_BASE + 0x10)
#endif
#ifdef TIMER_32K_SYNCHRONIZED
Index: linux-omap/arch/arm/plat-omap/timer32k.c
===================================================================
--- linux-omap.orig/arch/arm/plat-omap/timer32k.c
+++ linux-omap/arch/arm/plat-omap/timer32k.c
@@ -71,7 +71,7 @@ struct sys_timer omap_timer;
#if defined(CONFIG_ARCH_OMAP16XX)
#define TIMER_32K_SYNCHRONIZED 0xfffbc410
#elif defined(CONFIG_ARCH_OMAP24XX)
-#define TIMER_32K_SYNCHRONIZED (OMAP24XX_32KSYNCT_BASE + 0x10)
+#define TIMER_32K_SYNCHRONIZED (OMAP2_32KSYNCT_BASE + 0x10)
#else
#error OMAP 32KHz timer does not currently work on 15XX!
#endif
Index: linux-omap/include/asm-arm/arch-omap/omap24xx.h
===================================================================
--- linux-omap.orig/include/asm-arm/arch-omap/omap24xx.h
+++ linux-omap/include/asm-arm/arch-omap/omap24xx.h
@@ -73,7 +73,6 @@
#endif
/* Temporary defines to be cleaned up in following patches */
-#define OMAP24XX_32KSYNCT_BASE OMAP2_32KSYNCT_BASE
#define OMAP24XX_SDRC_BASE OMAP2_SDRC_BASE
#define OMAP24XX_PRCM_BASE OMAP2_PRCM_BASE
#define OMAP24XX_CTRL_BASE OMAP2_CTRL_BASE
--
next prev parent reply other threads:[~2007-05-21 22:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-21 22:59 [PATCH 0/5] Clean up omap24xx.h symbolic constants Paul Walmsley
2007-05-21 22:59 ` [PATCH 1/5] omap2: modify omap24xx.h to improve constant names and prepare for multi-arch kernels Paul Walmsley
2007-05-21 22:59 ` Paul Walmsley [this message]
2007-05-21 22:59 ` [PATCH 3/5] omap2: use OMAP2_PRCM_BASE in place of OMAP24XX_PRCM_BASE Paul Walmsley
2007-05-21 22:59 ` [PATCH 4/5] omap2: use OMAP2_SDRC_BASE in place of OMAP24XX_SDRC_BASE Paul Walmsley
2007-05-21 22:59 ` [PATCH 5/5] omap2: use OMAP2_CTRL_BASE in place of OMAP24XX_CTRL_BASE 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=20070521230014.635898932@pwsan.com \
--to=paul@pwsan.com \
--cc=linux-omap-open-source@linux.omap.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