From: Linus Walleij <linus.walleij@linaro.org> To: Wim Van Sebroeck <wim@iguana.be>, Guenter Roeck <linux@roeck-us.net>, Jonas Jensen <jonas.jensen@gmail.com>, Andrew Jeffery <andrew@aj.id.au>, Joel Stanley <joel@jms.id.au> Cc: linux-arm-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org> Subject: [PATCH 11/11] ARM: dts: Add PCLK to the Aspeed watchdogs Date: Sat, 12 Aug 2017 20:43:18 +0200 [thread overview] Message-ID: <20170812184318.10144-12-linus.walleij@linaro.org> (raw) In-Reply-To: <20170812184318.10144-1-linus.walleij@linaro.org> This adds the PCLK clock to the Aspeed watchdog blocks. I am not directly familiar with the Aspeed clocking, but since the IP is derived from Faraday FTWDT010 it probably has the ability to run the watchdog on the PCLK if desired so to obtain the frequency from it, it needs to be present in the device tree, and for completeness the PCLK should also be referenced and enabled anyways. Take this opportunity to add the "faraday,ftwdt010" compatible as fallback to the watchdog IP blocks. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- arch/arm/boot/dts/aspeed-g4.dtsi | 7 +++++-- arch/arm/boot/dts/aspeed-g5.dtsi | 12 +++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 8a04c7e2d818..23b100383c15 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -895,16 +895,19 @@ }; wdt1: wdt@1e785000 { - compatible = "aspeed,ast2400-wdt"; + compatible = "aspeed,ast2400-wdt", "faraday,ftwdt010"; reg = <0x1e785000 0x1c>; interrupts = <27>; + clocks = <&clk_apb>; + clock-names = "PCLK"; }; wdt2: wdt@1e785020 { - compatible = "aspeed,ast2400-wdt"; + compatible = "aspeed,ast2400-wdt", "faraday,ftwdt010"; reg = <0x1e785020 0x1c>; interrupts = <27>; clocks = <&clk_apb>; + clock-names = "PCLK"; status = "disabled"; }; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 9cffe347b828..2322d72cd8a9 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -1003,21 +1003,27 @@ wdt1: wdt@1e785000 { - compatible = "aspeed,ast2500-wdt"; + compatible = "aspeed,ast2500-wdt", "faraday,ftwdt010"; reg = <0x1e785000 0x20>; interrupts = <27>; + clocks = <&clk_apb>; + clock-names = "PCLK"; }; wdt2: wdt@1e785020 { - compatible = "aspeed,ast2500-wdt"; + compatible = "aspeed,ast2500-wdt", "faraday,ftwdt010"; reg = <0x1e785020 0x20>; interrupts = <27>; + clocks = <&clk_apb>; + clock-names = "PCLK"; status = "disabled"; }; wdt3: wdt@1e785040 { - compatible = "aspeed,ast2500-wdt"; + compatible = "aspeed,ast2500-wdt", "faraday,ftwdt010"; reg = <0x1e785040 0x20>; + clocks = <&clk_apb>; + clock-names = "PCLK"; status = "disabled"; }; -- 2.13.4
WARNING: multiple messages have this Message-ID (diff)
From: linus.walleij@linaro.org (Linus Walleij) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/11] ARM: dts: Add PCLK to the Aspeed watchdogs Date: Sat, 12 Aug 2017 20:43:18 +0200 [thread overview] Message-ID: <20170812184318.10144-12-linus.walleij@linaro.org> (raw) In-Reply-To: <20170812184318.10144-1-linus.walleij@linaro.org> This adds the PCLK clock to the Aspeed watchdog blocks. I am not directly familiar with the Aspeed clocking, but since the IP is derived from Faraday FTWDT010 it probably has the ability to run the watchdog on the PCLK if desired so to obtain the frequency from it, it needs to be present in the device tree, and for completeness the PCLK should also be referenced and enabled anyways. Take this opportunity to add the "faraday,ftwdt010" compatible as fallback to the watchdog IP blocks. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- arch/arm/boot/dts/aspeed-g4.dtsi | 7 +++++-- arch/arm/boot/dts/aspeed-g5.dtsi | 12 +++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 8a04c7e2d818..23b100383c15 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -895,16 +895,19 @@ }; wdt1: wdt at 1e785000 { - compatible = "aspeed,ast2400-wdt"; + compatible = "aspeed,ast2400-wdt", "faraday,ftwdt010"; reg = <0x1e785000 0x1c>; interrupts = <27>; + clocks = <&clk_apb>; + clock-names = "PCLK"; }; wdt2: wdt at 1e785020 { - compatible = "aspeed,ast2400-wdt"; + compatible = "aspeed,ast2400-wdt", "faraday,ftwdt010"; reg = <0x1e785020 0x1c>; interrupts = <27>; clocks = <&clk_apb>; + clock-names = "PCLK"; status = "disabled"; }; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 9cffe347b828..2322d72cd8a9 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -1003,21 +1003,27 @@ wdt1: wdt at 1e785000 { - compatible = "aspeed,ast2500-wdt"; + compatible = "aspeed,ast2500-wdt", "faraday,ftwdt010"; reg = <0x1e785000 0x20>; interrupts = <27>; + clocks = <&clk_apb>; + clock-names = "PCLK"; }; wdt2: wdt at 1e785020 { - compatible = "aspeed,ast2500-wdt"; + compatible = "aspeed,ast2500-wdt", "faraday,ftwdt010"; reg = <0x1e785020 0x20>; interrupts = <27>; + clocks = <&clk_apb>; + clock-names = "PCLK"; status = "disabled"; }; wdt3: wdt at 1e785040 { - compatible = "aspeed,ast2500-wdt"; + compatible = "aspeed,ast2500-wdt", "faraday,ftwdt010"; reg = <0x1e785040 0x20>; + clocks = <&clk_apb>; + clock-names = "PCLK"; status = "disabled"; }; -- 2.13.4
next prev parent reply other threads:[~2017-08-12 18:43 UTC|newest] Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-08-12 18:43 [PATCH 00/11] watchdog: Consolidate FTWDT010 derivatives Linus Walleij 2017-08-12 18:43 ` Linus Walleij [not found] ` <20170812184318.10144-1-linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-08-12 18:43 ` [PATCH 01/11] watchdog: gemini/ftwdt010: rename DT bindings Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-12 18:43 ` Linus Walleij [not found] ` <20170812184318.10144-2-linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-08-14 14:55 ` Guenter Roeck 2017-08-14 14:55 ` Guenter Roeck 2017-08-14 14:55 ` Guenter Roeck 2017-08-17 20:32 ` Rob Herring 2017-08-17 20:32 ` Rob Herring 2017-08-17 20:32 ` Rob Herring 2017-08-12 18:43 ` [PATCH 06/11] watchdog: ftwdt010: Extend DT bindings to derivatives Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-12 18:43 ` Linus Walleij [not found] ` <20170812184318.10144-7-linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-08-17 20:34 ` Rob Herring 2017-08-17 20:34 ` Rob Herring 2017-08-17 20:34 ` Rob Herring 2017-08-12 18:43 ` [PATCH 02/11] watchdog: gemini/ftwdt010: rename driver and symbols Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-14 15:01 ` Guenter Roeck 2017-08-14 15:01 ` Guenter Roeck 2017-08-24 20:45 ` Linus Walleij 2017-08-24 20:45 ` Linus Walleij 2017-08-27 17:14 ` Guenter Roeck 2017-08-27 17:14 ` Guenter Roeck 2017-08-12 18:43 ` [PATCH 03/11] watchdog: ftwdt010: Make interrupt optional Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-14 15:09 ` Guenter Roeck 2017-08-14 15:09 ` Guenter Roeck 2017-08-12 18:43 ` [PATCH 04/11] watchdog: ftwdt010: Add clock support Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-14 16:05 ` Guenter Roeck 2017-08-14 16:05 ` Guenter Roeck 2017-08-24 20:32 ` Linus Walleij 2017-08-24 20:32 ` Linus Walleij 2017-08-25 23:28 ` Stephen Boyd 2017-08-25 23:28 ` Stephen Boyd 2017-08-27 17:12 ` Guenter Roeck 2017-08-27 17:12 ` Guenter Roeck 2017-08-27 17:06 ` Guenter Roeck 2017-08-27 17:06 ` Guenter Roeck 2017-10-10 19:51 ` Linus Walleij 2017-10-10 19:51 ` Linus Walleij 2017-10-10 20:06 ` Linus Walleij 2017-10-10 20:06 ` Linus Walleij 2017-10-12 3:39 ` Joel Stanley 2017-10-12 3:39 ` Joel Stanley 2017-08-12 18:43 ` [PATCH 05/11] watchdog: ftwdt010: Add restart support Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-12 18:43 ` [PATCH 07/11] watchdog: ftwdt010: Delete surplus bindings Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-12 18:43 ` [PATCH 08/11] watchdog: ftwdt010/moxart: Merge MOXA ART into FTWDT010 Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-14 16:09 ` Guenter Roeck 2017-08-14 16:09 ` Guenter Roeck 2017-08-24 20:34 ` Linus Walleij 2017-08-24 20:34 ` Linus Walleij 2017-08-12 18:43 ` [PATCH 09/11] watchdog: ftwdt010/aspeed: Merge Aspeed " Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-14 15:04 ` Guenter Roeck 2017-08-14 15:04 ` Guenter Roeck 2017-08-24 20:41 ` Linus Walleij 2017-08-24 20:41 ` Linus Walleij 2017-08-27 17:13 ` Guenter Roeck 2017-08-27 17:13 ` Guenter Roeck 2017-08-12 18:43 ` [PATCH 10/11] ARM: dts: fix PCLK name on Gemini and MOXA ART Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-12 18:43 ` Linus Walleij [this message] 2017-08-12 18:43 ` [PATCH 11/11] ARM: dts: Add PCLK to the Aspeed watchdogs Linus Walleij 2017-10-10 20:09 ` Linus Walleij 2017-10-10 20:09 ` Linus Walleij 2017-10-12 3:37 ` Joel Stanley 2017-10-12 3:37 ` Joel Stanley 2017-10-12 7:35 ` Linus Walleij 2017-10-12 7:35 ` Linus Walleij 2017-10-11 3:48 ` Andrew Jeffery 2017-10-11 3:48 ` Andrew Jeffery 2017-10-11 6:32 ` Linus Walleij 2017-10-11 6:32 ` Linus Walleij 2017-10-11 7:14 ` Andrew Jeffery 2017-10-11 7:14 ` Andrew Jeffery 2017-08-14 1:24 ` [PATCH 00/11] watchdog: Consolidate FTWDT010 derivatives Joel Stanley 2017-08-14 1:24 ` Joel Stanley 2017-08-14 3:08 ` Andrew Jeffery 2017-08-14 3:08 ` Andrew Jeffery 2017-08-14 12:36 ` Linus Walleij 2017-08-14 12:36 ` Linus Walleij 2017-08-14 12:31 ` Linus Walleij 2017-08-14 12:31 ` Linus Walleij 2017-08-14 12:39 ` Linus Walleij 2017-08-14 12:39 ` Linus Walleij
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=20170812184318.10144-12-linus.walleij@linaro.org \ --to=linus.walleij@linaro.org \ --cc=andrew@aj.id.au \ --cc=joel@jms.id.au \ --cc=jonas.jensen@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=wim@iguana.be \ /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.