diff options
author | Leonid Iziumtsev <leonid.iziumtsev@se.atlascopco.com> | 2016-03-20 14:10:55 +0100 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2016-03-25 14:03:28 +0100 |
commit | f7440928e609734f6d24d6769927539762270e1e (patch) | |
tree | 03ad13dbf662b6193c9b69d3b7f2f471da24162c /arch/arm | |
parent | 8fb9eea5653796fea69a45b82cacb6d378a569f0 (diff) | |
download | u-boot-imx-f7440928e609734f6d24d6769927539762270e1e.zip u-boot-imx-f7440928e609734f6d24d6769927539762270e1e.tar.gz u-boot-imx-f7440928e609734f6d24d6769927539762270e1e.tar.bz2 |
mx27: 16-bit wide watchdog registers
Make the watchdog registers 16-bit wide, as they are according to TRM.
Signed-off-by: Leonid Iziumtsev <leonid.iziumtsev@se.atlascopco.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/cpu/arm926ejs/mx27/reset.c | 8 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-mx27/imx-regs.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/cpu/arm926ejs/mx27/reset.c b/arch/arm/cpu/arm926ejs/mx27/reset.c index f7b4a1c..e764986 100644 --- a/arch/arm/cpu/arm926ejs/mx27/reset.c +++ b/arch/arm/cpu/arm926ejs/mx27/reset.c @@ -27,14 +27,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, ®s->wcr); + writew(0x0000, ®s->wcr); /* Write Service Sequence */ - writel(0x00005555, ®s->wsr); - writel(0x0000AAAA, ®s->wsr); + writew(0x5555, ®s->wsr); + writew(0xAAAA, ®s->wsr); /* Enable watchdog */ - writel(WCR_WDE, ®s->wcr); + writew(WCR_WDE, ®s->wcr); while (1); /*NOTREACHED*/ diff --git a/arch/arm/include/asm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h index baf1d29..40b76d2 100644 --- a/arch/arm/include/asm/arch-mx27/imx-regs.h +++ b/arch/arm/include/asm/arch-mx27/imx-regs.h @@ -106,9 +106,9 @@ struct esdramc_regs { /* Watchdog Registers*/ struct wdog_regs { - u32 wcr; - u32 wsr; - u32 wstr; + u16 wcr; + u16 wsr; + u16 wstr; }; /* PLL registers */ |