From: Jan Luebbe <jlu@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 08/14] ARM omap3: make PRM defines SoC specific
Date: Thu, 13 Dec 2012 17:30:43 +0100 [thread overview]
Message-ID: <1355416249-22364-9-git-send-email-jlu@pengutronix.de> (raw)
In-Reply-To: <1355416249-22364-1-git-send-email-jlu@pengutronix.de>
From: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-omap/include/mach/omap3-silicon.h | 3 +--
arch/arm/mach-omap/omap3_generic.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap/include/mach/omap3-silicon.h b/arch/arm/mach-omap/include/mach/omap3-silicon.h
index a655729..1921923 100644
--- a/arch/arm/mach-omap/include/mach/omap3-silicon.h
+++ b/arch/arm/mach-omap/include/mach/omap3-silicon.h
@@ -128,7 +128,6 @@
#define OMAP_SDRC_CS1 0xA0000000
/* PRM */
-#define PRM_RSTCTRL_RESET 0x04
+#define OMAP3_PRM_RSTCTRL_RESET 0x04
#endif /* __ASM_ARCH_OMAP3_H */
-
diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c
index cbac06f..9932103 100644
--- a/arch/arm/mach-omap/omap3_generic.c
+++ b/arch/arm/mach-omap/omap3_generic.c
@@ -52,7 +52,7 @@
*/
void __noreturn reset_cpu(unsigned long addr)
{
- writel(PRM_RSTCTRL_RESET, PRM_REG(RSTCTRL));
+ writel(OMAP3_PRM_RSTCTRL_RESET, PRM_REG(RSTCTRL));
while (1);
}
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2012-12-13 16:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-13 16:30 AM33xx support Jan Luebbe
2012-12-13 16:30 ` [PATCH 01/14] ARM omap: remove unused function Jan Luebbe
2012-12-13 16:30 ` [PATCH 02/14] ARM omap4: remove unused struct Jan Luebbe
2012-12-13 16:30 ` [PATCH 03/14] ARM omap4: Add missing assembly protection in header file Jan Luebbe
2012-12-13 16:30 ` [PATCH 04/14] ARM omap4: Add missing double include protection Jan Luebbe
2012-12-13 16:30 ` [PATCH 05/14] ARM omap: Make gpmc base runtime configurable Jan Luebbe
2012-12-13 16:30 ` [PATCH 06/14] ARM omap: Make timer " Jan Luebbe
2012-12-13 16:30 ` [PATCH 07/14] ARM omap4: make PRM defines SoC specific Jan Luebbe
2012-12-13 16:30 ` Jan Luebbe [this message]
2012-12-13 16:30 ` [PATCH 09/14] ARM omap: Use SoC specific defines for gpmc and timer base Jan Luebbe
2012-12-13 16:30 ` [PATCH 10/14] ARM omap: include individual SoC files Jan Luebbe
2012-12-13 16:30 ` [PATCH 11/14] ARM OMAP AM33XX: create new ARCH for AM33xx Jan Luebbe
2012-12-13 16:30 ` [PATCH 12/14] arm: omap: am33xx: add support for low level debug Jan Luebbe
2012-12-13 16:30 ` [PATCH 13/14] arm: beaglebone: add first-stage support for AM335x and board Jan Luebbe
2012-12-18 12:52 ` Teresa Gámez
2012-12-13 16:30 ` [PATCH 14/14] drivers: net: add driver for TI CPSW Jan Luebbe
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=1355416249-22364-9-git-send-email-jlu@pengutronix.de \
--to=jlu@pengutronix.de \
--cc=barebox@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