public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH] watchdog: mpc8xx: Revert the 8xx watchdog back to CONFIG_HW_WATCHDOG
Date: Fri, 28 Feb 2020 13:37:48 -0500	[thread overview]
Message-ID: <20200228183748.GL18302@bill-the-cat> (raw)
In-Reply-To: <f2e3ede0ef5d990d42768b1e9ba37e89b9b71691.1582184331.git.christophe.leroy@c-s.fr>

On Thu, Feb 20, 2020 at 07:39:51AM +0000, Christophe Leroy wrote:

> Commit f3729ba6e7b2 ("watchdog: mpc8xx_wdt: Watchdog driver and macros
> cleanup") switched the watchdog to CONFIG_WATCHDOG. But this is not
> compatible with the 8xx because it starts the watchdog HW timer at
> reset and must be serviced from the very beginning including while
> U-boot is executed in the firmware before relocation in RAM.
> 
> Select CONFIG_HW_WATCHDOG and make hw_watchdog_reset() visible.
> 
> Meanwhile, finalise the cleanup of arch/powerpc/cpu/mpc8xx/Kconfig by
> removing the lines put in comment in that commit, and also remove
> again the selection of CONFIG_MPC8xx_WATCHDOG which was removed by
> that commit and brought back by mistake by commit b3134ffbd944
> ("watchdog: Kconfig: Sort entry alphabetically")
> 
> Note that there was an 'imply WATCHDOG' in the original commit but
> it disappeared in the Kconfig alphabetical sorting, so no need to
> remove it here.
> 
> Fixes: f3729ba6e7b2 ("watchdog: mpc8xx_wdt: Watchdog driver and macros cleanup")
> Fixes: b3134ffbd944 ("watchdog: Kconfig: Sort entry alphabetically")
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> Cc: Stefan Roese <sr@denx.de>
> Cc: Patrice Chotard <patrice.chotard@st.com>
> Reviewed-by: Stefan Roese <sr@denx.de>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200228/2fb2be42/attachment.sig>

      parent reply	other threads:[~2020-02-28 18:37 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-20  7:39 [PATCH] watchdog: mpc8xx: Revert the 8xx watchdog back to CONFIG_HW_WATCHDOG Christophe Leroy
2020-02-20  8:57 ` Stefan Roese
2020-02-25 16:40 ` Tom Rini
2020-02-26 16:22   ` Christophe Leroy
2020-02-28 18:37 ` Tom Rini [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=20200228183748.GL18302@bill-the-cat \
    --to=trini@konsulko.com \
    --cc=u-boot@lists.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox