summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLeonid Iziumtsev <leonid.iziumtsev@se.atlascopco.com>2016-03-20 14:10:55 +0100
committerStefano Babic <sbabic@denx.de>2016-03-25 14:03:28 +0100
commitf7440928e609734f6d24d6769927539762270e1e (patch)
tree03ad13dbf662b6193c9b69d3b7f2f471da24162c /arch
parent8fb9eea5653796fea69a45b82cacb6d378a569f0 (diff)
downloadtalos-obmc-uboot-f7440928e609734f6d24d6769927539762270e1e.tar.gz
talos-obmc-uboot-f7440928e609734f6d24d6769927539762270e1e.zip
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')
-rw-r--r--arch/arm/cpu/arm926ejs/mx27/reset.c8
-rw-r--r--arch/arm/include/asm/arch-mx27/imx-regs.h6
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 f7b4a1c83e..e764986737 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, &regs->wcr);
+ writew(0x0000, &regs->wcr);
/* Write Service Sequence */
- writel(0x00005555, &regs->wsr);
- writel(0x0000AAAA, &regs->wsr);
+ writew(0x5555, &regs->wsr);
+ writew(0xAAAA, &regs->wsr);
/* Enable watchdog */
- writel(WCR_WDE, &regs->wcr);
+ writew(WCR_WDE, &regs->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 baf1d29cc3..40b76d26f6 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 */
OpenPOWER on IntegriCloud