From: "Pali Rohár" <pali@kernel.org>
To: Priyanka Jain <priyanka.jain@nxp.com>, Wolfgang Denk <wd@denx.de>,
Sinan Akman <sinan@writeme.com>
Cc: u-boot@lists.denx.de
Subject: Re: [PATCH] powerpc: mpc85xx: Fix compilation with CONFIG_WDT
Date: Sat, 4 Jun 2022 15:04:29 +0200 [thread overview]
Message-ID: <20220604130429.w5l4fspbrrfkdyij@pali> (raw)
In-Reply-To: <20220428113143.9918-1-pali@kernel.org>
PING
On Thursday 28 April 2022 13:31:43 Pali Rohár wrote:
> When CONFIG_WDT is enabled then non-DM watchdog code cannot be used due to
> conflicting functions like watchdog_reset(). So disable compilation of
> mpc85xx watchdog_reset() function when CONFIG_WDT is enabled.
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
> ---
> arch/powerpc/cpu/mpc85xx/cpu.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
> index 261f79e40585..226a26ba320a 100644
> --- a/arch/powerpc/cpu/mpc85xx/cpu.c
> +++ b/arch/powerpc/cpu/mpc85xx/cpu.c
> @@ -348,6 +348,7 @@ __weak unsigned long get_tbclk(void)
> }
>
>
> +#ifndef CONFIG_WDT
> #if defined(CONFIG_WATCHDOG)
> #define WATCHDOG_MASK (TCR_WP(63) | TCR_WRC(3) | TCR_WIE)
> void
> @@ -376,6 +377,7 @@ watchdog_reset(void)
> enable_interrupts();
> }
> #endif /* CONFIG_WATCHDOG */
> +#endif
>
> /*
> * Initializes on-chip MMC controllers.
> --
> 2.20.1
>
prev parent reply other threads:[~2022-06-04 13:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-28 11:31 [PATCH] powerpc: mpc85xx: Fix compilation with CONFIG_WDT Pali Rohár
2022-06-04 13:04 ` Pali Rohár [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220604130429.w5l4fspbrrfkdyij@pali \
--to=pali@kernel.org \
--cc=priyanka.jain@nxp.com \
--cc=sinan@writeme.com \
--cc=u-boot@lists.denx.de \
--cc=wd@denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.