From: Andre Przywara <andre.przywara@arm.com>
To: Rob Herring <robh+dt@kernel.org>, devicetree@vger.kernel.org
Cc: Guenter Roeck <linux@roeck-us.net>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Viresh Kumar <vireshk@kernel.org>,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
Wei Xu <xuwei5@hisilicon.com>
Subject: [PATCH 05/10] arm64: dts: hisilicon: Fix SP805 clocks
Date: Fri, 28 Aug 2020 14:05:57 +0100 [thread overview]
Message-ID: <20200828130602.42203-6-andre.przywara@arm.com> (raw)
In-Reply-To: <20200828130602.42203-1-andre.przywara@arm.com>
The SP805 DT binding requires two clocks to be specified, but
Hisilicon platform DTs currently only specify one clock.
In practice, Linux would pick a clock named "apb_pclk" for the bus
clock, and the Linux and U-Boot SP805 driver would use the first clock
to derive the actual watchdog counter frequency.
Since currently both are the very same clock, we can just double the
clock reference, and add the correct clock-names, to match the binding.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 10 ++++++----
arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 5 +++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index d25aac5e0bf8..994140fbc916 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -1089,16 +1089,18 @@
compatible = "arm,sp805-wdt", "arm,primecell";
reg = <0x0 0xe8a06000 0x0 0x1000>;
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&crg_ctrl HI3660_OSC32K>;
- clock-names = "apb_pclk";
+ clocks = <&crg_ctrl HI3660_OSC32K>,
+ <&crg_ctrl HI3660_OSC32K>;
+ clock-names = "wdog_clk", "apb_pclk";
};
watchdog1: watchdog@e8a07000 {
compatible = "arm,sp805-wdt", "arm,primecell";
reg = <0x0 0xe8a07000 0x0 0x1000>;
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&crg_ctrl HI3660_OSC32K>;
- clock-names = "apb_pclk";
+ clocks = <&crg_ctrl HI3660_OSC32K>,
+ <&crg_ctrl HI3660_OSC32K>;
+ clock-names = "wdog_clk", "apb_pclk";
};
tsensor: tsensor@fff30000 {
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index 3d189d9f0d24..6578f8191d71 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -843,8 +843,9 @@
compatible = "arm,sp805-wdt", "arm,primecell";
reg = <0x0 0xf8005000 0x0 0x1000>;
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&ao_ctrl HI6220_WDT0_PCLK>;
- clock-names = "apb_pclk";
+ clocks = <&ao_ctrl HI6220_WDT0_PCLK>,
+ <&ao_ctrl HI6220_WDT0_PCLK>;
+ clock-names = "wdog_clk", "apb_pclk";
};
tsensor: tsensor@0,f7030700 {
--
2.17.1
next prev parent reply other threads:[~2020-08-28 13:09 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-28 13:05 [PATCH 00/10] dt-bindings: Convert SP805 to Json-schema (and fix users) Andre Przywara
2020-08-28 13:05 ` [PATCH 01/10] dt-bindings: watchdog: sp-805: Convert to Json-schema Andre Przywara
2020-08-31 5:28 ` Viresh Kumar
2020-09-08 17:20 ` Rob Herring
2020-09-08 17:25 ` Rob Herring
2020-08-28 13:05 ` [PATCH 02/10] arm64: dts: arm: Fix SP805 clock-names Andre Przywara
2020-08-28 13:05 ` [PATCH 03/10] arm64: dts: broadcom: " Andre Przywara
2020-08-28 17:08 ` Ray Jui
2020-08-28 19:32 ` Florian Fainelli
2020-08-31 3:57 ` Florian Fainelli
2020-08-28 13:05 ` [PATCH 04/10] arm64: dts: freescale: " Andre Przywara
2020-08-31 5:53 ` Shawn Guo
2020-08-28 13:05 ` Andre Przywara [this message]
2020-08-28 13:05 ` [PATCH 06/10] arm64: dts: lg: Fix SP805 clocks Andre Przywara
2020-08-28 13:05 ` [PATCH 07/10] ARM: dts: arm: " Andre Przywara
2020-08-28 14:45 ` Linus Walleij
2020-08-28 13:06 ` [PATCH 08/10] ARM: dts: Cygnus: " Andre Przywara
2020-08-28 17:09 ` Ray Jui
2020-08-28 19:31 ` Florian Fainelli
2020-08-31 3:55 ` Florian Fainelli
2020-08-31 3:59 ` Florian Fainelli
2020-08-28 13:06 ` [PATCH 09/10] ARM: dts: NSP: Fix SP805 clock-names Andre Przywara
2020-08-28 17:09 ` Ray Jui
2020-08-28 19:31 ` Florian Fainelli
2020-08-31 3:55 ` Florian Fainelli
2020-08-28 13:06 ` [PATCH 10/10] ARM: dts: hisilicon: Fix SP805 clocks Andre Przywara
2020-08-28 19:34 ` [PATCH 00/10] dt-bindings: Convert SP805 to Json-schema (and fix users) Florian Fainelli
2020-08-28 21:28 ` Rob Herring
2020-08-28 21:32 ` Florian Fainelli
2020-09-01 15:56 ` André Przywara
2020-09-04 8:58 ` Linus Walleij
2020-09-04 15:29 ` Florian Fainelli
2020-09-04 15:35 ` André Przywara
2020-09-04 15:40 ` Florian Fainelli
2020-09-08 12:48 ` Sudeep Holla
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=20200828130602.42203-6-andre.przywara@arm.com \
--to=andre.przywara@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=robh+dt@kernel.org \
--cc=vireshk@kernel.org \
--cc=wim@linux-watchdog.org \
--cc=xuwei5@hisilicon.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).