[U-Boot] [PATCH V2] imx25: Fix reset

[U-Boot] [PATCH V2] imx25: Fix reset

[Matthias Weisser]

This patch fixes the reset command on imx25

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
---
 arch/arm/cpu/arm926ejs/mx25/reset.c       |    8 ++++----
 arch/arm/include/asm/arch-mx25/imx-regs.h |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/cpu/arm926ejs/mx25/reset.c b/arch/arm/cpu/arm926ejs/mx25/reset.c
index 1e33150..27270c3 100644
--- a/arch/arm/cpu/arm926ejs/mx25/reset.c
+++ b/arch/arm/cpu/arm926ejs/mx25/reset.c
@@ -43,14 +43,14 @@ void reset_cpu (ulong ignored)
 {
 	struct wdog_regs *regs = (struct wdog_regs *)IMX_WDT_BASE;
 	/* Disable watchdog and set Time-Out field to 0 */
-	writel (0x00000000, &regs->wcr);
+	writew(0x00000000, &regs->wcr);
 
 	/* Write Service Sequence */
-	writel (0x00005555, &regs->wsr);
-	writel (0x0000AAAA, &regs->wsr);
+	writew(0x00005555, &regs->wsr);
+	writew(0x0000AAAA, &regs->wsr);
 
 	/* Enable watchdog */
-	writel (WCR_WDE, &regs->wcr);
+	writew(WCR_WDE, &regs->wcr);
 
 	while (1) ;
 }
diff --git a/arch/arm/include/asm/arch-mx25/imx-regs.h b/arch/arm/include/asm/arch-mx25/imx-regs.h
index f709bd8..fe258a8 100644
--- a/arch/arm/include/asm/arch-mx25/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx25/imx-regs.h
@@ -108,11 +108,11 @@ struct gpt_regs {
 
 /* Watchdog Timer (WDOG) registers */
 struct wdog_regs {
-	u32 wcr;	/* Control */
-	u32 wsr;	/* Service */
-	u32 wrsr;	/* Reset Status */
-	u32 wicr;	/* Interrupt Control */
-	u32 wmcr;	/* Misc Control */
+	u16 wcr;	/* Control */
+	u16 wsr;	/* Service */
+	u16 wrsr;	/* Reset Status */
+	u16 wicr;	/* Interrupt Control */
+	u16 wmcr;	/* Misc Control */
 };
 
 /* IIM control registers */
-- 
1.7.0.4

[U-Boot] [PATCH V2] imx25: Fix reset

[Reinhard Meyer]

Dear Matthias Weisser,
> This patch fixes the reset command on imx25
> 
> Signed-off-by: Matthias Weisser <weisserm@arcor.de>
> +	writew(0x00000000, &regs->wcr);
> +	writew(0x00005555, &regs->wsr);
> +	writew(0x0000AAAA, &regs->wsr);

It might be "nicer" to use 16 Bit constants (with 4 hex digits)
here..?

Best Regards,
Reinhard

[U-Boot] [PATCH V2] imx25: Fix reset

[Matthias Weißer]

Am 26.10.2010 11:27, schrieb Reinhard Meyer:
> Dear Matthias Weisser,
>> This patch fixes the reset command on imx25
>>
>> Signed-off-by: Matthias Weisser<weisserm@arcor.de>
>> +	writew(0x00000000,&regs->wcr);
>> +	writew(0x00005555,&regs->wsr);
>> +	writew(0x0000AAAA,&regs->wsr);
>
> It might be "nicer" to use 16 Bit constants (with 4 hex digits)
> here..?

Sure. Would be nicer. I wait a bit for further comments and will create 
a V3 then.

Matthias

[U-Boot] [PATCH V2] imx25: Fix reset

[Jason Liu]

Hi,

2010/10/26 Matthias Wei?er <weisserm@arcor.de>:
> Am 26.10.2010 11:27, schrieb Reinhard Meyer:
>> Dear Matthias Weisser,
>>> This patch fixes the reset command on imx25
>>>
>>> Signed-off-by: Matthias Weisser<weisserm@arcor.de>
>>> + ? ?writew(0x00000000,&regs->wcr);
>>> + ? ?writew(0x00005555,&regs->wsr);
>>> + ? ?writew(0x0000AAAA,&regs->wsr);
>>
>> It might be "nicer" to use 16 Bit constants (with 4 hex digits)
>> here..?
>
> Sure. Would be nicer. I wait a bit for further comments and will create
> a V3 then.

Add please append to the commit log about why you make such change?
It will be clear to read and understand your change for this patch.

>
> Matthias
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>