Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

watchdog: booke_wdt: Replace PPC_FSL_BOOK3E by PPC_E500

CONFIG_PPC_FSL_BOOK3E is redundant with CONFIG_PPC_E500.

Replace it so that CONFIG_PPC_FSL_BOOK3E can be removed later.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/01a9132d51d3d8d9c74576d3da4d9d1fa5a88bde.1663606876.git.christophe.leroy@csgroup.eu

authored by

Christophe Leroy and committed by
Michael Ellerman
ec65560a 404a5e72

+8 -8
+4 -4
drivers/watchdog/Kconfig
··· 1935 1935 config BOOKE_WDT_DEFAULT_TIMEOUT 1936 1936 int "PowerPC Book-E Watchdog Timer Default Timeout" 1937 1937 depends on BOOKE_WDT 1938 - default 38 if PPC_FSL_BOOK3E 1939 - range 0 63 if PPC_FSL_BOOK3E 1940 - default 3 if !PPC_FSL_BOOK3E 1941 - range 0 3 if !PPC_FSL_BOOK3E 1938 + default 38 if PPC_E500 1939 + range 0 63 if PPC_E500 1940 + default 3 if !PPC_E500 1941 + range 0 3 if !PPC_E500 1942 1942 help 1943 1943 Select the default watchdog timer period to be used by the PowerPC 1944 1944 Book-E watchdog driver. A watchdog "event" occurs when the bit
+4 -4
drivers/watchdog/booke_wdt.c
··· 27 27 */ 28 28 29 29 30 - #ifdef CONFIG_PPC_FSL_BOOK3E 30 + #ifdef CONFIG_PPC_E500 31 31 #define WDTP(x) ((((x)&0x3)<<30)|(((x)&0x3c)<<15)) 32 32 #define WDTP_MASK (WDTP(0x3f)) 33 33 #else ··· 45 45 "Watchdog cannot be stopped once started (default=" 46 46 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); 47 47 48 - #ifdef CONFIG_PPC_FSL_BOOK3E 48 + #ifdef CONFIG_PPC_E500 49 49 50 50 /* For the specified period, determine the number of seconds 51 51 * corresponding to the reset time. There will be a watchdog ··· 88 88 89 89 #define MAX_WDT_TIMEOUT period_to_sec(1) 90 90 91 - #else /* CONFIG_PPC_FSL_BOOK3E */ 91 + #else /* CONFIG_PPC_E500 */ 92 92 93 93 static unsigned long long period_to_sec(unsigned int period) 94 94 { ··· 102 102 103 103 #define MAX_WDT_TIMEOUT 3 /* from Kconfig */ 104 104 105 - #endif /* !CONFIG_PPC_FSL_BOOK3E */ 105 + #endif /* !CONFIG_PPC_E500 */ 106 106 107 107 static void __booke_wdt_set(void *data) 108 108 {