summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-12-18 15:22:30 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-12-19 21:51:49 +0100
commitfa96d920a5bff464d6b37aedb009b304f46f6b70 (patch)
tree09c370af7aa311362cd7426589c0339975f8217f /arch
parenta9fe13a08bf50b42b66145231e26fbd25949b774 (diff)
downloadbarebox-fa96d920a5bff464d6b37aedb009b304f46f6b70.tar.gz
barebox-fa96d920a5bff464d6b37aedb009b304f46f6b70.tar.xz
ARM omap3: make PRM defines SoC specific
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap/include/mach/omap3-silicon.h3
-rw-r--r--arch/arm/mach-omap/omap3_generic.c2
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 a655729f8f..19219236fd 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 cbac06f786..99321036bd 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);
}