mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] ARM pcm043: Fix macro name
@ 2012-11-20  7:12 Christian Hemp
  2012-11-20  8:33 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Hemp @ 2012-11-20  7:12 UTC (permalink / raw)
  To: barebox

Since commit dc9d70e2 the define CCM_PDR4 is called MX35_CCM_PDR4.

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
---
 arch/arm/boards/pcm043/lowlevel.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boards/pcm043/lowlevel.c b/arch/arm/boards/pcm043/lowlevel.c
index 06f05ab..751f6ae 100644
--- a/arch/arm/boards/pcm043/lowlevel.c
+++ b/arch/arm/boards/pcm043/lowlevel.c
@@ -46,10 +46,10 @@ static void __bare_init __naked insdram(void)
 	uint32_t r;
 
 	/* Speed up NAND controller by adjusting the NFC divider */
-	r = readl(MX35_CCM_BASE_ADDR + CCM_PDR4);
+	r = readl(MX35_CCM_BASE_ADDR + MX35_CCM_PDR4);
 	r &= ~(0xf << 28);
 	r |= 0x1 << 28;
-	writel(r, MX35_CCM_BASE_ADDR + CCM_PDR4);
+	writel(r, MX35_CCM_BASE_ADDR + MX35_CCM_PDR4);
 
 	/* setup a stack to be able to call imx_nand_load_image() */
 	arm_setup_stack(STACK_BASE + STACK_SIZE - 12);
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] ARM pcm043: Fix macro name
  2012-11-20  7:12 [PATCH] ARM pcm043: Fix macro name Christian Hemp
@ 2012-11-20  8:33 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2012-11-20  8:33 UTC (permalink / raw)
  To: Christian Hemp; +Cc: barebox

On Tue, Nov 20, 2012 at 08:12:00AM +0100, Christian Hemp wrote:
> Since commit dc9d70e2 the define CCM_PDR4 is called MX35_CCM_PDR4.
> 
> Signed-off-by: Christian Hemp <c.hemp@phytec.de>

Applied, thanks. Added the same fix for cupid aswell.

Sascha

> ---
>  arch/arm/boards/pcm043/lowlevel.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boards/pcm043/lowlevel.c b/arch/arm/boards/pcm043/lowlevel.c
> index 06f05ab..751f6ae 100644
> --- a/arch/arm/boards/pcm043/lowlevel.c
> +++ b/arch/arm/boards/pcm043/lowlevel.c
> @@ -46,10 +46,10 @@ static void __bare_init __naked insdram(void)
>  	uint32_t r;
>  
>  	/* Speed up NAND controller by adjusting the NFC divider */
> -	r = readl(MX35_CCM_BASE_ADDR + CCM_PDR4);
> +	r = readl(MX35_CCM_BASE_ADDR + MX35_CCM_PDR4);
>  	r &= ~(0xf << 28);
>  	r |= 0x1 << 28;
> -	writel(r, MX35_CCM_BASE_ADDR + CCM_PDR4);
> +	writel(r, MX35_CCM_BASE_ADDR + MX35_CCM_PDR4);
>  
>  	/* setup a stack to be able to call imx_nand_load_image() */
>  	arm_setup_stack(STACK_BASE + STACK_SIZE - 12);
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-11-20  8:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-20  7:12 [PATCH] ARM pcm043: Fix macro name Christian Hemp
2012-11-20  8:33 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox