On Wed, Oct 20, 2010 at 03:48:20AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 14:55 Tue 19 Oct , Sascha Hauer wrote: > > Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > > --- > > 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 oops, bug. on i.MX1 WSR should be 0x4 and SWTR should be 0x8. Will fix this. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
