[PATCH 21/42] i.MX remove wdog registers from header files
Jean-Christophe PLAGNIOL-VILLARD
plagnioj at jcrosoft.com
Tue Oct 19 21:48:20 EDT 2010
On 14:55 Tue 19 Oct , Sascha Hauer wrote:
> Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
> ---
> arch/arm/mach-imx/clocksource.c | 23 +++++++++++++++++++----
> arch/arm/mach-imx/include/mach/imx1-regs.h | 8 --------
> arch/arm/mach-imx/include/mach/imx21-regs.h | 8 --------
> arch/arm/mach-imx/include/mach/imx27-regs.h | 8 --------
> arch/arm/mach-imx/include/mach/imx31-regs.h | 10 ----------
> arch/arm/mach-imx/include/mach/imx35-regs.h | 10 ----------
> arch/arm/mach-imx/include/mach/imx51-regs.h | 7 -------
> 7 files changed, 19 insertions(+), 55 deletions(-)
>
> diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c
> index e492890..4cb923f 100644
> --- a/arch/arm/mach-imx/clocksource.c
> +++ b/arch/arm/mach-imx/clocksource.c
> @@ -101,19 +101,34 @@ static int clocksource_init (void)
> core_initcall(clocksource_init);
>
> /*
> + * Watchdog Registers
> + */
> +#ifdef CONFIG_ARCH_IMX1
> +#define WDOG_WCR 0x00 /* Watchdog Control Register */
> +#define WDOG_WSR 0x02 /* Watchdog Service Register */
> +#define WDOG_WSTR 0x04 /* Watchdog Status Register */
> +#define WDOG_WCR_WDE (1 << 0)
> +#else
> +#define WDOG_WCR 0x00 /* Watchdog Control Register */
> +#define WDOG_WSR 0x02 /* Watchdog Service Register */
> +#define WDOG_WSTR 0x04 /* Watchdog Status Register */
> +#define WDOG_WCR_WDE (1 << 2)
only the WDE seems different
Best Regards,
J.
More information about the barebox
mailing list