Skip to contentSkip to conversation

imx25: Fix reset

PATCH Superseded Matthias Weisser 3 participants 5 messages Oct 27, 2010 – Oct 28, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 imx25: Fix reset

This patch fixes the reset command on imx25. The watchdog registers are 16 bits in size and not 32. This patch also adds the service register codes as constants.

---

Changes since V2
- Using 16 bit constants

Changes since V1
- Corrected whitespace
- Leaving reset sequence as it originally was

 arch/arm/cpu/arm926ejs/mx25/reset.c       |    8 ++++----
 arch/arm/include/asm/arch-mx25/imx-regs.h |   14 ++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)
arch/arm/cpu/arm926ejs/mx25/reset.c +4 -4
index 1e33150..1a43683 100644
@@ -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(0, &regs->wcr);
 
 	/* Write Service Sequence */
-	writel (0x00005555, &regs->wsr);
-	writel (0x0000AAAA, &regs->wsr);
+	writew(WSR_UNLOCK1, &regs->wsr);
+	writew(WSR_UNLOCK2, &regs->wsr);
 
 	/* Enable watchdog */
-	writel (WCR_WDE, &regs->wcr);
+	writew(WCR_WDE, &regs->wcr);
 
 	while (1) ;
 }
arch/arm/include/asm/arch-mx25/imx-regs.h +8 -6
index f709bd8..f5a2929 100644
@@ -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 */
@@ -308,7 +308,9 @@ struct iim_regs {
 #define GPT_CTRL_TEN		1		/* Timer enable	*/
 
 /* WDOG enable */
-#define WCR_WDE 0x04
+#define WCR_WDE 		0x04
+#define WSR_UNLOCK1		0x5555
+#define WSR_UNLOCK2		0xAAAA
 
 /* FUSE bank offsets */
 #define IIM0_MAC		0x1a
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH v3 1/1 imx25: Fix reset

Dear Matthias Weisser,

arch/arm/include/asm/arch-mx25/imx-regs.h struct gpt_regs { · line 116

Quoted 12 lines

struct wdog_regs {

arch/arm/include/asm/arch-mx25/imx-regs.h +5 -5
-	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 */
 };

What catches my ARM-aware eye:

I do not know the hardware, but are those registers really arranged on 2 byte boundaries (00, 02, 04, 06, 08, 0a, .. offsets)? Probably yes, assuming your code is tested ;)

Or should there be a u16 filler between each register?

Best Regards,
Reinhard

#2 lore raw

PATCH v3 1/1 imx25: Fix reset

Quoted 15 lines · Reinhard Meyer

Dear Matthias Weisser,

arch/arm/include/asm/arch-mx25/imx-regs.h struct gpt_regs { · line 116

Quoted 12 lines

struct wdog_regs {

arch/arm/include/asm/arch-mx25/imx-regs.h +5 -5
-	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 */
 };

What catches my ARM-aware eye:

Quoted 3 lines

I do not know the hardware, but are those registers really arranged on 2 byte boundaries (00, 02, 04, 06, 08, 0a, .. offsets)? Probably yes, assuming your code is tested ;)

Yes, they are. It sounds strange, but they are 16-bit wide.

Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================
#3 lore raw

PATCH v3 1/1 imx25: Fix reset

In reply to Reinhard Meyer

Hello Reinhard

Am 27.10.2010 16:43, schrieb Reinhard Meyer:

Quoted 15 lines

Dear Matthias Weisser,

arch/arm/include/asm/arch-mx25/imx-regs.h struct gpt_regs { · line 116

Quoted 12 lines
  struct wdog_regs {
arch/arm/include/asm/arch-mx25/imx-regs.h +5 -5
-	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 */
  };

What catches my ARM-aware eye:

Quoted 3 lines

I do not know the hardware, but are those registers really arranged on 2 byte boundaries (00, 02, 04, 06, 08, 0a, .. offsets)? Probably yes, assuming your code is tested ;)

Yes, they are. I looked into the datasheet multiple times to confirm that. Not typical for an ARM system, but how knows which IP Freescale recycled here ;-)

If you want to convince yourself take a look at page 1988 of
http://cache.freescale.com/files/dsp/doc/ref_manual/IMX25RM.pdf?fpsp=1

Matthias

#4 lore raw

PATCH v3 1/1 imx25: Fix reset

In reply to Matthias Weisser
Quoted 10 lines · Matthias Weisser

This patch fixes the reset command on imx25. The watchdog registers are 16 bits in size and not 32. This patch also adds the service register codes as constants.

---

Changes since V2
- Using 16 bit constants

Quoted 7 lines

Changes since V1
- Corrected whitespace
- Leaving reset sequence as it originally was

 arch/arm/cpu/arm926ejs/mx25/reset.c       |    8 ++++----
 arch/arm/include/asm/arch-mx25/imx-regs.h |   14 ++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================