From: paul@pwsan.com (Paul Walmsley)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/10] OMAP2420: CTRL: fix OMAP242X_CTRL_REGADDR macro
Date: Fri, 01 Oct 2010 15:34:54 -0600 [thread overview]
Message-ID: <20101001213449.1408.30597.stgit@twilight.localdomain> (raw)
In-Reply-To: <20101001213119.1408.65395.stgit@twilight.localdomain>
Conform the OMAP2420_CTRL_BASE macro name to the standard of the rest of the
OMAP*_CTRL_BASE macro names. This fixes a bug in the OMAP2420 SCM code that
prevented OMAP242X_CTRL_REGADDR from working.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
---
arch/arm/plat-omap/common.c | 2 +-
arch/arm/plat-omap/include/plat/omap24xx.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 7d668b3..9200ea7 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -269,7 +269,7 @@ static struct omap_globals omap242x_globals = {
.tap = OMAP2_L4_IO_ADDRESS(0x48014000),
.sdrc = OMAP2420_SDRC_BASE,
.sms = OMAP2420_SMS_BASE,
- .ctrl = OMAP2420_CTRL_BASE,
+ .ctrl = OMAP242X_CTRL_BASE,
.prm = OMAP2420_PRM_BASE,
.cm = OMAP2420_CM_BASE,
.uart1_phys = OMAP2_UART1_BASE,
diff --git a/arch/arm/plat-omap/include/plat/omap24xx.h b/arch/arm/plat-omap/include/plat/omap24xx.h
index 7055672..92df9e2 100644
--- a/arch/arm/plat-omap/include/plat/omap24xx.h
+++ b/arch/arm/plat-omap/include/plat/omap24xx.h
@@ -40,7 +40,7 @@
#define OMAP24XX_IC_BASE (L4_24XX_BASE + 0xfe000)
#define OMAP24XX_IVA_INTC_BASE 0x40000000
-#define OMAP2420_CTRL_BASE L4_24XX_BASE
+#define OMAP242X_CTRL_BASE L4_24XX_BASE
#define OMAP2420_32KSYNCT_BASE (L4_24XX_BASE + 0x4000)
#define OMAP2420_PRCM_BASE (L4_24XX_BASE + 0x8000)
#define OMAP2420_CM_BASE (L4_24XX_BASE + 0x8000)
next prev parent reply other threads:[~2010-10-01 21:34 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-01 21:34 [PATCH 00/10] OMAP: SCM/McBSP/clock: branch integration patches for 2.6.37 Paul Walmsley
2010-10-01 21:34 ` [PATCH 01/10] OMAP2+: Kconfig: disallow builds for boards that don't use the currently-selected SoC Paul Walmsley
2010-10-04 4:21 ` Varadarajan, Charulatha
2010-10-04 5:45 ` Paul Walmsley
2010-10-01 21:34 ` Paul Walmsley [this message]
2010-10-01 21:34 ` [PATCH 03/10] OMAP2420: clock: add MCBSP_CLKS node and clkdev aliases Paul Walmsley
2010-10-01 21:35 ` [PATCH 04/10] OMAP2430: " Paul Walmsley
2010-10-01 21:35 ` [PATCH 05/10] OMAP3xxx: clock: add clkdev aliases for McBSP fclk source switching Paul Walmsley
2010-10-01 21:35 ` [PATCH 06/10] OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c Paul Walmsley
2010-10-01 21:35 ` [PATCH 07/10] OMAP: McBSP: implement functional clock switching via clock framework Paul Walmsley
2010-10-05 8:35 ` Peter Ujfalusi
2010-10-05 9:57 ` Paul Walmsley
2010-10-01 21:35 ` [PATCH 08/10] OMAP: split plat-omap/common.c Paul Walmsley
2010-10-04 5:34 ` Shilimkar, Santosh
2010-10-04 6:56 ` Felipe Balbi
2010-10-04 7:00 ` Felipe Balbi
2010-10-04 7:28 ` Shilimkar, Santosh
2010-10-04 18:21 ` Tony Lindgren
2010-10-04 19:32 ` Paul Walmsley
2010-10-05 4:37 ` Shilimkar, Santosh
2010-10-05 4:55 ` Paul Walmsley
2010-10-05 5:19 ` Shilimkar, Santosh
2010-10-04 5:38 ` Varadarajan, Charulatha
2010-10-04 6:03 ` Paul Walmsley
2010-10-04 8:28 ` Varadarajan, Charulatha
2010-10-04 18:27 ` Tony Lindgren
2010-10-04 19:24 ` Paul Walmsley
2010-10-04 9:08 ` Cousson, Benoit
2010-10-04 9:35 ` DebBarma, Tarun Kanti
2010-10-04 9:54 ` Cousson, Benoit
2010-10-04 19:15 ` Paul Walmsley
2010-10-04 19:26 ` Paul Walmsley
2010-10-05 11:00 ` Sergei Shtylyov
2010-10-05 15:07 ` Paul Walmsley
2010-10-01 21:35 ` [PATCH 09/10] OMAP: control: move plat-omap/control.h to mach-omap2/control.h Paul Walmsley
2010-10-01 21:35 ` [PATCH 10/10] OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks Paul Walmsley
2010-10-05 12:52 ` [PATCH 00/10] OMAP: SCM/McBSP/clock: branch integration patches for 2.6.37 Jarkko Nikula
2010-10-05 18:40 ` Tony Lindgren
2010-10-06 5:42 ` Peter Ujfalusi
2010-10-06 14:48 ` Tony Lindgren
2010-10-06 15:08 ` Liam Girdwood
2010-10-06 18:57 ` Paul Walmsley
2010-10-06 16:33 ` Mark Brown
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=20101001213449.1408.30597.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