* [PATCH v2 0/2] watchdog: aspeed: Add support for ast2600 @ 2019-08-19 5:17 Joel Stanley 2019-08-19 5:17 ` [PATCH v2 1/2] dt-bindings: watchdog: Add ast2600 compatible Joel Stanley 2019-08-19 5:17 ` [PATCH v2 2/2] watchdog: aspeed: Add support for AST2600 Joel Stanley 0 siblings, 2 replies; 6+ messages in thread From: Joel Stanley @ 2019-08-19 5:17 UTC (permalink / raw) To: Wim Van Sebroeck, Guenter Roeck, Rob Herring Cc: devicetree, Ryan Chen, linux-watchdog, linux-aspeed, Andrew Jeffery, linux-arm-kernel Hello, Here's a small patch series to enable the ast2600 watchdog. v2 addresses Guenter's review. Joel Stanley (1): dt-bindings: watchdog: Add ast2600 compatible Ryan Chen (1): watchdog: aspeed: Add support for AST2600 Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt | 1 + drivers/watchdog/aspeed_wdt.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.23.0.rc1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] dt-bindings: watchdog: Add ast2600 compatible 2019-08-19 5:17 [PATCH v2 0/2] watchdog: aspeed: Add support for ast2600 Joel Stanley @ 2019-08-19 5:17 ` Joel Stanley 2019-08-27 16:49 ` Rob Herring 2019-08-31 14:52 ` Guenter Roeck 2019-08-19 5:17 ` [PATCH v2 2/2] watchdog: aspeed: Add support for AST2600 Joel Stanley 1 sibling, 2 replies; 6+ messages in thread From: Joel Stanley @ 2019-08-19 5:17 UTC (permalink / raw) To: Wim Van Sebroeck, Guenter Roeck, Rob Herring Cc: devicetree, Ryan Chen, linux-watchdog, linux-aspeed, Andrew Jeffery, linux-arm-kernel This adds a compatible for the ast2600, a new ASPEED SoC. Signed-off-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Andrew Jeffery <andrew@aj.id.au> --- v2: - Add Andrew's r-b --- Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt b/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt index c5077a1f5cb3..d78d4a8fb868 100644 --- a/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt @@ -4,6 +4,7 @@ Required properties: - compatible: must be one of: - "aspeed,ast2400-wdt" - "aspeed,ast2500-wdt" + - "aspeed,ast2600-wdt" - reg: physical base address of the controller and length of memory mapped region -- 2.23.0.rc1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: watchdog: Add ast2600 compatible 2019-08-19 5:17 ` [PATCH v2 1/2] dt-bindings: watchdog: Add ast2600 compatible Joel Stanley @ 2019-08-27 16:49 ` Rob Herring 2019-08-31 14:52 ` Guenter Roeck 1 sibling, 0 replies; 6+ messages in thread From: Rob Herring @ 2019-08-27 16:49 UTC (permalink / raw) To: Joel Stanley Cc: devicetree, Ryan Chen, linux-watchdog, linux-aspeed, Andrew Jeffery, linux-arm-kernel, Wim Van Sebroeck, Guenter Roeck On Mon, 19 Aug 2019 14:47:37 +0930, Joel Stanley wrote: > This adds a compatible for the ast2600, a new ASPEED SoC. > > Signed-off-by: Joel Stanley <joel@jms.id.au> > Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > --- > v2: > - Add Andrew's r-b > --- > Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt | 1 + > 1 file changed, 1 insertion(+) > Reviewed-by: Rob Herring <robh@kernel.org> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: watchdog: Add ast2600 compatible 2019-08-19 5:17 ` [PATCH v2 1/2] dt-bindings: watchdog: Add ast2600 compatible Joel Stanley 2019-08-27 16:49 ` Rob Herring @ 2019-08-31 14:52 ` Guenter Roeck 1 sibling, 0 replies; 6+ messages in thread From: Guenter Roeck @ 2019-08-31 14:52 UTC (permalink / raw) To: Joel Stanley Cc: devicetree, Ryan Chen, linux-watchdog, linux-aspeed, Andrew Jeffery, Rob Herring, Wim Van Sebroeck, linux-arm-kernel On Mon, Aug 19, 2019 at 02:47:37PM +0930, Joel Stanley wrote: > This adds a compatible for the ast2600, a new ASPEED SoC. > > Signed-off-by: Joel Stanley <joel@jms.id.au> > Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > Reviewed-by: Rob Herring <robh@kernel.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > v2: > - Add Andrew's r-b > --- > Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt b/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt > index c5077a1f5cb3..d78d4a8fb868 100644 > --- a/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt > +++ b/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt > @@ -4,6 +4,7 @@ Required properties: > - compatible: must be one of: > - "aspeed,ast2400-wdt" > - "aspeed,ast2500-wdt" > + - "aspeed,ast2600-wdt" > > - reg: physical base address of the controller and length of memory mapped > region _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] watchdog: aspeed: Add support for AST2600 2019-08-19 5:17 [PATCH v2 0/2] watchdog: aspeed: Add support for ast2600 Joel Stanley 2019-08-19 5:17 ` [PATCH v2 1/2] dt-bindings: watchdog: Add ast2600 compatible Joel Stanley @ 2019-08-19 5:17 ` Joel Stanley 2019-08-20 15:50 ` Guenter Roeck 1 sibling, 1 reply; 6+ messages in thread From: Joel Stanley @ 2019-08-19 5:17 UTC (permalink / raw) To: Wim Van Sebroeck, Guenter Roeck, Rob Herring Cc: devicetree, Ryan Chen, linux-watchdog, linux-aspeed, Andrew Jeffery, linux-arm-kernel From: Ryan Chen <ryan_chen@aspeedtech.com> The ast2600 can be supported by the same code as the ast2500. Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com> Signed-off-by: Joel Stanley <joel@jms.id.au> --- v2: Reuse ast2500 config structure --- drivers/watchdog/aspeed_wdt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c index cc71861e033a..5b64bc2e8788 100644 --- a/drivers/watchdog/aspeed_wdt.c +++ b/drivers/watchdog/aspeed_wdt.c @@ -34,6 +34,7 @@ static const struct aspeed_wdt_config ast2500_config = { static const struct of_device_id aspeed_wdt_of_table[] = { { .compatible = "aspeed,ast2400-wdt", .data = &ast2400_config }, { .compatible = "aspeed,ast2500-wdt", .data = &ast2500_config }, + { .compatible = "aspeed,ast2600-wdt", .data = &ast2500_config }, { }, }; MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table); @@ -259,7 +260,8 @@ static int aspeed_wdt_probe(struct platform_device *pdev) set_bit(WDOG_HW_RUNNING, &wdt->wdd.status); } - if (of_device_is_compatible(np, "aspeed,ast2500-wdt")) { + if ((of_device_is_compatible(np, "aspeed,ast2500-wdt")) || + (of_device_is_compatible(np, "aspeed,ast2600-wdt"))) { u32 reg = readl(wdt->base + WDT_RESET_WIDTH); reg &= config->ext_pulse_width_mask; -- 2.23.0.rc1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] watchdog: aspeed: Add support for AST2600 2019-08-19 5:17 ` [PATCH v2 2/2] watchdog: aspeed: Add support for AST2600 Joel Stanley @ 2019-08-20 15:50 ` Guenter Roeck 0 siblings, 0 replies; 6+ messages in thread From: Guenter Roeck @ 2019-08-20 15:50 UTC (permalink / raw) To: Joel Stanley Cc: devicetree, Ryan Chen, linux-watchdog, linux-aspeed, Andrew Jeffery, Rob Herring, Wim Van Sebroeck, linux-arm-kernel On Mon, Aug 19, 2019 at 02:47:38PM +0930, Joel Stanley wrote: > From: Ryan Chen <ryan_chen@aspeedtech.com> > > The ast2600 can be supported by the same code as the ast2500. > > Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com> > Signed-off-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > v2: > Reuse ast2500 config structure > --- > drivers/watchdog/aspeed_wdt.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c > index cc71861e033a..5b64bc2e8788 100644 > --- a/drivers/watchdog/aspeed_wdt.c > +++ b/drivers/watchdog/aspeed_wdt.c > @@ -34,6 +34,7 @@ static const struct aspeed_wdt_config ast2500_config = { > static const struct of_device_id aspeed_wdt_of_table[] = { > { .compatible = "aspeed,ast2400-wdt", .data = &ast2400_config }, > { .compatible = "aspeed,ast2500-wdt", .data = &ast2500_config }, > + { .compatible = "aspeed,ast2600-wdt", .data = &ast2500_config }, > { }, > }; > MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table); > @@ -259,7 +260,8 @@ static int aspeed_wdt_probe(struct platform_device *pdev) > set_bit(WDOG_HW_RUNNING, &wdt->wdd.status); > } > > - if (of_device_is_compatible(np, "aspeed,ast2500-wdt")) { > + if ((of_device_is_compatible(np, "aspeed,ast2500-wdt")) || > + (of_device_is_compatible(np, "aspeed,ast2600-wdt"))) { > u32 reg = readl(wdt->base + WDT_RESET_WIDTH); > > reg &= config->ext_pulse_width_mask; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-08-31 14:53 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-08-19 5:17 [PATCH v2 0/2] watchdog: aspeed: Add support for ast2600 Joel Stanley 2019-08-19 5:17 ` [PATCH v2 1/2] dt-bindings: watchdog: Add ast2600 compatible Joel Stanley 2019-08-27 16:49 ` Rob Herring 2019-08-31 14:52 ` Guenter Roeck 2019-08-19 5:17 ` [PATCH v2 2/2] watchdog: aspeed: Add support for AST2600 Joel Stanley 2019-08-20 15:50 ` Guenter Roeck
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).