From: Guenter Roeck <linux@roeck-us.net> To: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: wim@linux-watchdog.org, linux-watchdog@vger.kernel.org, Eugen Hristev <eugen.hristev@microchip.com>, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/3] watchdog: sama5d4_wdt: add support for sama7g5-wdt Date: Fri, 11 Jun 2021 03:35:41 -0700 [thread overview] Message-ID: <20210611103541.GA3189041@roeck-us.net> (raw) In-Reply-To: <94d409ba-2073-a84e-5c8e-580f6e12191c@microchip.com> On Fri, Jun 11, 2021 at 09:19:56AM +0200, Nicolas Ferre wrote: > 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@microchip.com> > > > > Reviewed-by: Guenter Roeck <linux@roeck-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 applied the series to my watchdog-next branch. That is all I can do from my side. Guenter > > 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
WARNING: multiple messages have this Message-ID (diff)
From: Guenter Roeck <linux@roeck-us.net> To: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: wim@linux-watchdog.org, linux-watchdog@vger.kernel.org, Eugen Hristev <eugen.hristev@microchip.com>, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/3] watchdog: sama5d4_wdt: add support for sama7g5-wdt Date: Fri, 11 Jun 2021 03:35:41 -0700 [thread overview] Message-ID: <20210611103541.GA3189041@roeck-us.net> (raw) In-Reply-To: <94d409ba-2073-a84e-5c8e-580f6e12191c@microchip.com> On Fri, Jun 11, 2021 at 09:19:56AM +0200, Nicolas Ferre wrote: > 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@microchip.com> > > > > Reviewed-by: Guenter Roeck <linux@roeck-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 applied the series to my watchdog-next branch. That is all I can do from my side. Guenter > > 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-11 10:35 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-27 10:01 [PATCH 1/3] dt-bindings: watchdog: sama5d4-wdt: convert to yaml Eugen Hristev 2021-05-27 10:01 ` Eugen Hristev 2021-05-27 10:01 ` [PATCH 2/3] watchdog: sama5d4_wdt: add support for sama7g5-wdt Eugen Hristev 2021-05-27 10:01 ` Eugen Hristev 2021-05-27 12:09 ` Nicolas Ferre 2021-05-27 12:09 ` Nicolas Ferre 2021-05-27 16:55 ` Guenter Roeck 2021-05-27 16:55 ` Guenter Roeck 2021-06-11 7:19 ` Nicolas Ferre 2021-06-11 7:19 ` Nicolas Ferre 2021-06-11 10:35 ` Guenter Roeck [this message] 2021-06-11 10:35 ` Guenter Roeck 2021-06-11 12:24 ` Nicolas Ferre 2021-06-11 12:24 ` Nicolas Ferre 2021-05-27 10:01 ` [PATCH 3/3] dt-bindings: watchdog: sama5d4-wdt: add compatible " Eugen Hristev 2021-05-27 10:01 ` Eugen Hristev 2021-06-04 20:20 ` Rob Herring 2021-06-04 20:20 ` Rob Herring 2021-06-04 20:20 ` [PATCH 1/3] dt-bindings: watchdog: sama5d4-wdt: convert to yaml Rob Herring 2021-06-04 20:20 ` Rob Herring 2021-06-06 16:52 ` Nicolas Ferre 2021-06-06 16:52 ` Nicolas Ferre 2021-06-11 12:19 ` Nicolas Ferre 2021-06-11 12:19 ` Nicolas Ferre
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=20210611103541.GA3189041@roeck-us.net \ --to=linux@roeck-us.net \ --cc=devicetree@vger.kernel.org \ --cc=eugen.hristev@microchip.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=nicolas.ferre@microchip.com \ --cc=robh+dt@kernel.org \ --cc=wim@linux-watchdog.org \ /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: linkBe 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.