Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

powerpc/watchdog: replace CONFIG_FSL_BOOKE with CONFIG_PPC_FSL_BOOK3E

Browse source 
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: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Shaohui Xie 2012-05-11 13:33:40 +08:00 committed by Kumar Gala
parent 5a271fe784
commit be0884ce23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/watchdog/Kconfig
View file

@ -1115,10 +1115,10 @@ config BOOKE_WDT
config BOOKE_WDT_DEFAULT_TIMEOUT config BOOKE_WDT_DEFAULT_TIMEOUT
int "PowerPC Book-E Watchdog Timer Default Timeout" int "PowerPC Book-E Watchdog Timer Default Timeout"
depends on BOOKE_WDT depends on BOOKE_WDT
default 38 if FSL_BOOKE default 38 if PPC_FSL_BOOK3E
range 0 63 if FSL_BOOKE range 0 63 if PPC_FSL_BOOK3E
default 3 if !FSL_BOOKE default 3 if !PPC_FSL_BOOK3E
range 0 3 if !FSL_BOOKE range 0 3 if !PPC_FSL_BOOK3E
help help
Select the default watchdog timer period to be used by the PowerPC Select the default watchdog timer period to be used by the PowerPC
Book-E watchdog driver. A watchdog "event" occurs when the bit Book-E watchdog driver. A watchdog "event" occurs when the bit

4
drivers/watchdog/booke_wdt.c
View file

@ -37,7 +37,7 @@
u32 booke_wdt_enabled; u32 booke_wdt_enabled;
u32 booke_wdt_period = CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT; 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(x) ((((x)&0x3)<<30)|(((x)&0x3c)<<15))
#define WDTP_MASK (WDTP(0x3f)) #define WDTP_MASK (WDTP(0x3f))
#else #else
@ -190,7 +190,7 @@ static long booke_wdt_ioctl(struct file *file,
case WDIOC_SETTIMEOUT: case WDIOC_SETTIMEOUT:
if (get_user(tmp, p)) if (get_user(tmp, p))
return -EFAULT; return -EFAULT;
#ifdef CONFIG_FSL_BOOKE #ifdef CONFIG_PPC_FSL_BOOK3E
/* period of 1 gives the largest possible timeout */ /* period of 1 gives the largest possible timeout */
if (tmp > period_to_sec(1)) if (tmp > period_to_sec(1))
return -EINVAL; return -EINVAL;