From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tky4P-0001iQ-2n for barebox@lists.infradead.org; Tue, 18 Dec 2012 14:23:02 +0000 From: Jan Luebbe Date: Tue, 18 Dec 2012 15:22:30 +0100 Message-Id: <1355840561-11552-9-git-send-email-jlu@pengutronix.de> In-Reply-To: <1355840561-11552-1-git-send-email-jlu@pengutronix.de> References: <1355840561-11552-1-git-send-email-jlu@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 08/19] ARM omap3: make PRM defines SoC specific To: barebox@lists.infradead.org From: Sascha Hauer Signed-off-by: Sascha Hauer --- 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