lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 11 Jun 2021 09:19:56 +0200 From: Nicolas Ferre <nicolas.ferre@...rochip.com> To: <wim@...ux-watchdog.org>, Guenter Roeck <linux@...ck-us.net>, <linux-watchdog@...r.kernel.org>, Eugen Hristev <eugen.hristev@...rochip.com> CC: <robh+dt@...nel.org>, <devicetree@...r.kernel.org>, <linux-arm-kernel@...ts.infradead.org>, <linux-kernel@...r.kernel.org> Subject: Re: [PATCH 2/3] watchdog: sama5d4_wdt: add support for sama7g5-wdt On 27/05/2021 at 18:55, Guenter Roeck wrote: > On Thu, May 27, 2021 at 01:01:19PM +0300, Eugen Hristev wrote: >> Add support for compatible sama7g5-wdt. >> The sama7g5 wdt is the same hardware block as on sam9x60. >> Adapt the driver to use the sam9x60/sama7g5 variant if either >> of the two compatibles are selected (sam9x60-wdt/sama7g5-wdt). >> >> Signed-off-by: Eugen Hristev <eugen.hristev@...rochip.com> > > Reviewed-by: Guenter Roeck <linux@...ck-us.net> Guenter, Wim, How do we proceed? Do I take this "driver" patch through my tree which goes to arm-soc or do you take it with the watchdog tree? I'm planning to send my pull-requests before the end of this week. Best regards, Nicolas >> --- >> drivers/watchdog/sama5d4_wdt.c | 10 ++++++++-- >> 1 file changed, 8 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c >> index e5d11d6a2600..ec20ad4e534f 100644 >> --- a/drivers/watchdog/sama5d4_wdt.c >> +++ b/drivers/watchdog/sama5d4_wdt.c >> @@ -268,8 +268,10 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) >> wdd->min_timeout = MIN_WDT_TIMEOUT; >> wdd->max_timeout = MAX_WDT_TIMEOUT; >> wdt->last_ping = jiffies; >> - wdt->sam9x60_support = of_device_is_compatible(dev->of_node, >> - "microchip,sam9x60-wdt"); >> + >> + if (of_device_is_compatible(dev->of_node, "microchip,sam9x60-wdt") || >> + of_device_is_compatible(dev->of_node, "microchip,sama7g5-wdt")) >> + wdt->sam9x60_support = true; >> >> watchdog_set_drvdata(wdd, wdt); >> >> @@ -329,6 +331,10 @@ static const struct of_device_id sama5d4_wdt_of_match[] = { >> { >> .compatible = "microchip,sam9x60-wdt", >> }, >> + { >> + .compatible = "microchip,sama7g5-wdt", >> + }, >> + >> { } >> }; >> MODULE_DEVICE_TABLE(of, sama5d4_wdt_of_match); >> -- >> 2.25.1 >> -- Nicolas Ferre
Powered by blists - more mailing lists