Re: [PATCH v1 13/19] watchdog: booke_wdt: Replace PPC_FSL_BOOK3E by PPC_E500

[Guenter Roeck <linux@roeck-us.net>]

On 9/8/22 10:37, Christophe Leroy wrote:
> 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>
> Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: linux-watchdog@vger.kernel.org

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
>   drivers/watchdog/Kconfig     | 8 ++++----
>   drivers/watchdog/booke_wdt.c | 8 ++++----
>   2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 9295492d24f7..b7c03c600567 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1935,10 +1935,10 @@ config BOOKE_WDT
>   config BOOKE_WDT_DEFAULT_TIMEOUT
>   	int "PowerPC Book-E Watchdog Timer Default Timeout"
>   	depends on BOOKE_WDT
> -	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
> +	default 38 if PPC_E500
> +	range 0 63 if PPC_E500
> +	default 3 if !PPC_E500
> +	range 0 3 if !PPC_E500
>   	help
>   	  Select the default watchdog timer period to be used by the PowerPC
>   	  Book-E watchdog driver.  A watchdog "event" occurs when the bit
> diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
> index 75da5cd02615..932a03f4436a 100644
> --- a/drivers/watchdog/booke_wdt.c
> +++ b/drivers/watchdog/booke_wdt.c
> @@ -27,7 +27,7 @@
>    */
>   
>   
> -#ifdef	CONFIG_PPC_FSL_BOOK3E
> +#ifdef	CONFIG_PPC_E500
>   #define WDTP(x)		((((x)&0x3)<<30)|(((x)&0x3c)<<15))
>   #define WDTP_MASK	(WDTP(0x3f))
>   #else
> @@ -45,7 +45,7 @@ MODULE_PARM_DESC(nowayout,
>   		"Watchdog cannot be stopped once started (default="
>   				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
>   
> -#ifdef CONFIG_PPC_FSL_BOOK3E
> +#ifdef CONFIG_PPC_E500
>   
>   /* For the specified period, determine the number of seconds
>    * corresponding to the reset time.  There will be a watchdog
> @@ -88,7 +88,7 @@ static unsigned int sec_to_period(unsigned int secs)
>   
>   #define MAX_WDT_TIMEOUT		period_to_sec(1)
>   
> -#else /* CONFIG_PPC_FSL_BOOK3E */
> +#else /* CONFIG_PPC_E500 */
>   
>   static unsigned long long period_to_sec(unsigned int period)
>   {
> @@ -102,7 +102,7 @@ static unsigned int sec_to_period(unsigned int secs)
>   
>   #define MAX_WDT_TIMEOUT		3	/* from Kconfig */
>   
> -#endif /* !CONFIG_PPC_FSL_BOOK3E */
> +#endif /* !CONFIG_PPC_E500 */
>   
>   static void __booke_wdt_set(void *data)
>   {