From: Stefano Babic <sbabic@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] mx27: 16-bit wide watchdog registers
Date: Fri, 25 Mar 2016 14:03:59 +0100 [thread overview]
Message-ID: <56F5373F.9090206@denx.de> (raw)
In-Reply-To: <1458479455-19791-1-git-send-email-leonid.iziumtsev@gmail.com>
On 20/03/2016 14:10, Leonid Iziumtsev wrote:
> From: Leonid Iziumtsev <leonid.iziumtsev@se.atlascopco.com>
>
> Make the watchdog registers 16-bit wide, as they are according to TRM.
>
> Signed-off-by: Leonid Iziumtsev <leonid.iziumtsev@se.atlascopco.com>
> ---
> arch/arm/cpu/arm926ejs/mx27/reset.c | 8 ++++----
> 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 */
>
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
prev parent reply other threads:[~2016-03-25 13:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-20 13:10 [U-Boot] [PATCH] mx27: 16-bit wide watchdog registers Leonid Iziumtsev
2016-03-20 23:28 ` Fabio Estevam
2016-03-25 13:03 ` Stefano Babic [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56F5373F.9090206@denx.de \
--to=sbabic@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox