[PATCH 4/4] ARM: ep93xx: use more reliable CPLD watchdog for reset on ts72xx

[ynezz@true.cz (Petr Štetiar)]

Ryan Mallon <ryan@bluewatersys.com> [2011-05-31 18:47:57]:

> > +#ifdef CONFIG_MACH_TS72XX
> > +	/*
> > +	 * It's more reliable to use CPLD watchdog to perform the reset
> > +	 */
> > +	if (board_is_ts7200() || board_is_ts7250() || board_is_ts7260() ||
> > +	    board_is_ts7300() || board_is_ts7400()) {
> > +		__raw_writeb(0x5, TS72XX_WDT_FEED_PHYS_BASE);
> > +		__raw_writeb(0x1, TS72XX_WDT_CONTROL_PHYS_BASE);
> > +	}
> > +#else
> >  	/*
> >  	 * Set then clear the SWRST bit to initiate a software reset
> >  	 */
> >  	ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_SWRST);
> >  	ep93xx_devcfg_clear_bits(EP93XX_SYSCON_DEVCFG_SWRST);
> > +#endif
> 
> Do we need the ifdef here? Isn't the if (board_is_xxx) test enough?

Yes, sure, that the test is enough. The rationale behind that ifdef is, that I
was just thinking, that it's not necessary to drag-in more code (althought
very small) in the kernel for other ep93xx machines. If it's ok without, I'll
make v2.

-- ynezz