From: Joel Stanley <joel@jms.id.au>
To: Joel Stanley <joel@jms.id.au>, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Cc: "Russell King" <linux@armlinux.org.uk>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, "Andrew Jeffery" <andrew@aj.id.au>,
"Cédric Le Goater" <clg@kaod.org>,
linux-aspeed@lists.ozlabs.org
Subject: [PATCH 1/2] ARM: dts: aspeed: Remove undocumented wdt properties
Date: Wed, 4 Oct 2017 19:46:34 +1030 [thread overview]
Message-ID: <20171004091635.12499-2-joel@jms.id.au> (raw)
In-Reply-To: <20171004091635.12499-1-joel@jms.id.au>
The watchdog bindings do not describe an interrupt property nor clock
phandle, and the upstream driver never had code to use them. Drop them
from the device tree.
Also rename the node from wdt the more commonly used watchdog.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
arch/arm/boot/dts/aspeed-g4.dtsi | 7 ++-----
arch/arm/boot/dts/aspeed-g5.dtsi | 8 +++-----
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index e455bd236798..5be2e6a39917 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -204,17 +204,14 @@
status = "disabled";
};
- wdt1: wdt@1e785000 {
+ wdt1: watchdog@1e785000 {
compatible = "aspeed,ast2400-wdt";
reg = <0x1e785000 0x1c>;
- interrupts = <27>;
};
- wdt2: wdt@1e785020 {
+ wdt2: watchdog@1e785020 {
compatible = "aspeed,ast2400-wdt";
reg = <0x1e785020 0x1c>;
- interrupts = <27>;
- clocks = <&clk_apb>;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 77dded187d5a..71e1264b81aa 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -248,20 +248,18 @@
status = "disabled";
};
- wdt1: wdt@1e785000 {
+ wdt1: watchdog@1e785000 {
compatible = "aspeed,ast2500-wdt";
reg = <0x1e785000 0x20>;
- interrupts = <27>;
};
- wdt2: wdt@1e785020 {
+ wdt2: watchdog@1e785020 {
compatible = "aspeed,ast2500-wdt";
reg = <0x1e785020 0x20>;
- interrupts = <27>;
status = "disabled";
};
- wdt3: wdt@1e785040 {
+ wdt3: watchdog@1e785040 {
compatible = "aspeed,ast2500-wdt";
reg = <0x1e785040 0x20>;
status = "disabled";
--
2.14.1
next prev parent reply other threads:[~2017-10-04 9:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-04 9:16 [PATCH 0/2] ARM: dts: aspeed: Watchdog fixes Joel Stanley
2017-10-04 9:16 ` Joel Stanley [this message]
[not found] ` <20171004091635.12499-2-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>
2017-10-04 11:14 ` [PATCH 1/2] ARM: dts: aspeed: Remove undocumented wdt properties Andrew Jeffery
2017-10-04 9:16 ` [PATCH 2/2] ARM: dts: aspeed: Enable watchdog two Joel Stanley
2017-10-04 11:15 ` Andrew Jeffery
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=20171004091635.12499-2-joel@jms.id.au \
--to=joel@jms.id.au \
--cc=andrew@aj.id.au \
--cc=clg@kaod.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.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: 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).