On Thu, Mar 01, 2018 at 06:17:22PM +0000, Fabrizio Castro wrote: > Due to commits: > * "ARM: shmobile: Add watchdog support", > * "ARM: shmobile: rcar-gen2: Add watchdog support", and > * "soc: renesas: rcar-rst: Enable watchdog as reset trigger for Gen2", > we now have everything we needed for the watchdog to work on Gen2 and > RZ/G1. > > This commit adds "renesas,rcar-gen2-wdt" as compatible string for R-Car > Gen2 and RZ/G1. > > Signed-off-by: Fabrizio Castro <fabrizio.cas...@bp.renesas.com> > Signed-off-by: Ramesh Shanmugasundaram > <ramesh.shanmugasunda...@bp.renesas.com> > Reviewed-by: Geert Uytterhoeven <geert+rene...@glider.be> > Reviewed-by: Wolfram Sang <wsa+rene...@sang-engineering.com>
Reviewed-by: Guenter Roeck <li...@roeck-us.net> > --- > v6->v7: > * no change > > drivers/watchdog/renesas_wdt.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c > index 024d54e..9fc4c78 100644 > --- a/drivers/watchdog/renesas_wdt.c > +++ b/drivers/watchdog/renesas_wdt.c > @@ -228,12 +228,8 @@ static int __maybe_unused rwdt_resume(struct device *dev) > > static SIMPLE_DEV_PM_OPS(rwdt_pm_ops, rwdt_suspend, rwdt_resume); > > -/* > - * This driver does also fit for R-Car Gen2 (r8a779[0-4]) WDT. However, for > SMP > - * to work there, one also needs a RESET (RST) driver which does not exist > yet > - * due to HW issues. This needs to be solved before adding compatibles here. > - */ > static const struct of_device_id rwdt_ids[] = { > + { .compatible = "renesas,rcar-gen2-wdt", }, > { .compatible = "renesas,rcar-gen3-wdt", }, > { /* sentinel */ } > }; > -- > 2.7.4 >