From: Paul Walmsley <paul@pwsan.com>
To: linux-omap-open-source@linux.omap.com
Subject: [PATCH 3/3] omap2: merge CONTROL_STATUS defines
Date: Wed, 02 May 2007 12:33:23 -0600 [thread overview]
Message-ID: <20070502183844.522873513@pwsan.com> (raw)
In-Reply-To: 20070502183320.656693735@pwsan.com
[-- Attachment #1: hoist-control-status-define.patch --]
[-- Type: text/plain, Size: 1889 bytes --]
The *_CONTROL_STATUS defines in include/asm-arm/arch-omap/omap24xx.h
are shared between 2420 and 2430, so merge and rename those
defines to reflect that.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/board-h4.c | 2 +-
include/asm-arm/arch-omap/omap24xx.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Index: linux-omap-2.6/arch/arm/mach-omap2/board-h4.c
===================================================================
--- linux-omap-2.6.orig/arch/arm/mach-omap2/board-h4.c
+++ linux-omap-2.6/arch/arm/mach-omap2/board-h4.c
@@ -265,7 +265,7 @@ static struct platform_device *h4_device
/* 2420 Sysboot setup (2430 is different) */
static u32 get_sysboot_value(void)
{
- return (omap_readl(OMAP242X_CONTROL_STATUS) & 0xFFF);
+ return (omap_readl(OMAP24XX_CONTROL_STATUS) & 0xFFF);
}
/* FIXME: This function should be moved to some other file, gpmc.c? */
Index: linux-omap-2.6/include/asm-arm/arch-omap/omap24xx.h
===================================================================
--- linux-omap-2.6.orig/include/asm-arm/arch-omap/omap24xx.h
+++ linux-omap-2.6/include/asm-arm/arch-omap/omap24xx.h
@@ -17,17 +17,17 @@
#define OMAP24XX_IVA_INTC_BASE 0x40000000
#define IRQ_SIR_IRQ 0x0040
+#define OMAP24XX_CONTROL_STATUS (L4_24XX_BASE + 0x2f8)
+
#ifdef CONFIG_ARCH_OMAP2420
#define OMAP24XX_32KSYNCT_BASE (L4_24XX_BASE + 0x4000)
#define OMAP24XX_PRCM_BASE (L4_24XX_BASE + 0x8000)
#define OMAP24XX_SDRC_BASE (L3_24XX_BASE + 0x9000)
-#define OMAP242X_CONTROL_STATUS (L4_24XX_BASE + 0x2f8)
#endif
#ifdef CONFIG_ARCH_OMAP2430
#define OMAP24XX_32KSYNCT_BASE (L4_WK_243X_BASE + 0x20000)
#define OMAP24XX_PRCM_BASE (L4_WK_243X_BASE + 0x6000)
-#define OMAP242X_CONTROL_STATUS (L4_24XX_BASE + 0x2f8)
#define OMAP243X_SMS_BASE 0x6C000000
#define OMAP24XX_SDRC_BASE 0x6D000000
#define OMAP243X_GPMC_BASE 0x6E000000
--
next prev parent reply other threads:[~2007-05-02 18:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-02 18:33 [PATCH 0/3] omap2: trivial cleanup patches Paul Walmsley
2007-05-02 18:33 ` [PATCH 1/3] omap2: standardize clock.h enable_reg/enable_bit order Paul Walmsley
2007-05-02 18:33 ` [PATCH 2/3] omap2: fix clock.h rate_offset whitespace Paul Walmsley
2007-05-02 18:33 ` Paul Walmsley [this message]
2007-05-03 17:08 ` [PATCH 0/3] omap2: trivial cleanup patches 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=20070502183844.522873513@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