On 26 February 2023 14:14:25 GMT, Emil Renner Berthing <emil.renner.berthing@xxxxxxxxxxxxx> wrote: >On Mon, 20 Feb 2023 at 09:21, Xingyu Wu <xingyu.wu@xxxxxxxxxxxxxxxx> wrote: >> >> Add watchdog driver for the StarFive JH7110 SoC. >> >> Signed-off-by: Xingyu Wu <xingyu.wu@xxxxxxxxxxxxxxxx> >> --- >> MAINTAINERS | 7 + >> drivers/watchdog/Kconfig | 9 + >> drivers/watchdog/Makefile | 2 + >> drivers/watchdog/starfive-wdt.c | 651 ++++++++++++++++++++++++++++++++ >> 4 files changed, 669 insertions(+) >> create mode 100644 drivers/watchdog/starfive-wdt.c >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 135d93368d36..6cbcf08fa76a 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -19933,6 +19933,13 @@ F: Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml >> F: drivers/reset/reset-starfive-jh7100.c >> F: include/dt-bindings/reset/starfive-jh7100.h >> >> +STARFIVE JH7110 WATCHDOG DRIVER >> +M: Xingyu Wu <xingyu.wu@xxxxxxxxxxxxxxxx> >> +M: Samin Guo <samin.guo@xxxxxxxxxxxxxxxx> >> +S: Supported >> +F: Documentation/devicetree/bindings/watchdog/starfive* >> +F: drivers/watchdog/starfive-wdt.c >> + >> STATIC BRANCH/CALL >> M: Peter Zijlstra <peterz@xxxxxxxxxxxxx> >> M: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> >> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig >> index 0bc40b763b06..4608eb5c9501 100644 >> --- a/drivers/watchdog/Kconfig >> +++ b/drivers/watchdog/Kconfig >> @@ -2089,6 +2089,15 @@ config UML_WATCHDOG >> tristate "UML watchdog" >> depends on UML || COMPILE_TEST >> >> +config STARFIVE_WATCHDOG >> + tristate "StarFive Watchdog support" >> + depends on RISCV > >Let's do like the pinctrl and clock drivers and > > depends SOC_STARFIVE || COMPILE_TEST Or better yet, rebase on 6.3-rc1, and use ARCH_STARFIVE and save me a conversion! Thanks, Conor.
