Commit be0884ce authored by Shaohui Xie's avatar Shaohui Xie Committed by Kumar Gala
Browse files

powerpc/watchdog: replace CONFIG_FSL_BOOKE with CONFIG_PPC_FSL_BOOK3E 



CONFIG_FSL_BOOKE is only defined in 32-bit, CONFIG_PPC_FSL_BOOK3E is
defined in both 32-bit and 64-bit, so use CONFIG_PPC_FSL_BOOK3E to make
driver work in 32-bit & 64-bit.

Signed-off-by: default avatarShaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 5a271fe7

drivers/watchdog/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -1115,10 +1115,10 @@ config BOOKE_WDT 
config BOOKE_WDT_DEFAULT_TIMEOUT

	int "PowerPC Book-E Watchdog Timer Default Timeout"

	depends on BOOKE_WDT

	default 38 if FSL_BOOKE

	range 0 63 if FSL_BOOKE

	default 3 if !FSL_BOOKE

	range 0 3 if !FSL_BOOKE

	default 38 if PPC_FSL_BOOK3E

	range 0 63 if PPC_FSL_BOOK3E

	default 3 if !PPC_FSL_BOOK3E

	range 0 3 if !PPC_FSL_BOOK3E

	help

	  Select the default watchdog timer period to be used by the PowerPC

	  Book-E watchdog driver.  A watchdog "event" occurs when the bit

drivers/watchdog/booke_wdt.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
u32 booke_wdt_enabled;

u32 booke_wdt_period = CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT;



#ifdef	CONFIG_FSL_BOOKE

#ifdef	CONFIG_PPC_FSL_BOOK3E

#define WDTP(x)		((((x)&0x3)<<30)|(((x)&0x3c)<<15))

#define WDTP_MASK	(WDTP(0x3f))

#else
@@ -190,7 +190,7 @@ static long booke_wdt_ioctl(struct file *file, 
	case WDIOC_SETTIMEOUT:

		if (get_user(tmp, p))

			return -EFAULT;

#ifdef	CONFIG_FSL_BOOKE

#ifdef	CONFIG_PPC_FSL_BOOK3E

		/* period of 1 gives the largest possible timeout */

		if (tmp > period_to_sec(1))

			return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE