From: Harald Geyer <harald@ccbib.org>
To: Maxime Ripard <maxime.ripard@bootlin.com>, Chen-Yu Tsai <wens@csie.org>
Cc: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Andre Przywara <andre.przywara@arm.com>,
Icenowy Zheng <icenowy@aosc.io>,
info@olimex.com, Harald Geyer <harald@ccbib.org>
Subject: [PATCHv2 2/5] arm64: dts: allwinner: a64: Add watchdog
Date: Thu, 15 Mar 2018 16:25:07 +0000 [thread overview]
Message-ID: <20180315162510.11669-3-harald@ccbib.org> (raw)
In-Reply-To: <20180315162510.11669-1-harald@ccbib.org>
Add a watchdog node for the A64, automatically enabled on all boards.
Since the device is compatible with an existing driver, we only reserve
a new compatible string to be used together with the fall back.
Tested on Olimex Teres-I.
Signed-off-by: Harald Geyer <harald@ccbib.org>
---
changes since v1:
* add and use a specific compatible string
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt | 6 ++++--
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 7 +++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
index 62dd5baad70e..04fc368d828f 100644
--- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
@@ -2,8 +2,10 @@ Allwinner SoCs Watchdog timer
Required properties:
-- compatible : should be either "allwinner,sun4i-a10-wdt" or
- "allwinner,sun6i-a31-wdt"
+- compatible : should be one of
+ "allwinner,sun4i-a10-wdt"
+ "allwinner,sun6i-a31-wdt"
+ "allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt"
- reg : Specifies base physical address and size of the registers.
Example:
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 64e452a758fa..8401e7f887ff 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -665,5 +665,12 @@
#address-cells = <1>;
#size-cells = <0>;
};
+
+ wdt0: watchdog@1c20ca0 {
+ compatible = "allwinner,sun50i-a64-wdt",
+ "allwinner,sun6i-a31-wdt";
+ reg = <0x01c20ca0 0x20>;
+ interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+ };
};
};
--
2.11.0
next prev parent reply other threads:[~2018-03-15 16:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 16:25 [PATCHv2 0/5] arm64: allwinner: Add support for TERES-I laptop Harald Geyer
2018-03-15 16:25 ` [PATCHv2 1/5] arm64: dts: allwinner: a64: Add i2c0 pins Harald Geyer
2018-03-15 16:25 ` Harald Geyer [this message]
2018-03-18 12:52 ` [PATCHv2 2/5] arm64: dts: allwinner: a64: Add watchdog Rob Herring
2018-03-15 16:25 ` [PATCHv2 3/5] arm64: dts: allwinner: a64: add simplefb for A64 SoC Harald Geyer
2018-03-15 16:25 ` [PATCHv2 4/5] arm64: dts: allwinner: a64: Add pwm device Harald Geyer
2018-03-18 12:52 ` Rob Herring
2018-03-18 13:51 ` André Przywara
2018-03-15 16:25 ` [PATCHv2 5/5] arm64: allwinner: a64: Add support for TERES-I laptop Harald Geyer
2018-03-16 6:37 ` afzal mohammed
2018-03-16 17:50 ` afzal mohammed
2018-03-18 20:22 ` Maxime Ripard
2018-03-19 7:17 ` afzal mohammed
2018-03-19 21:27 ` Maxime Ripard
2018-03-19 15:27 ` Harald Geyer
2018-03-20 14:13 ` Maxime Ripard
2018-03-20 17:09 ` Andre Przywara
2018-03-22 17:59 ` Maxime Ripard
2018-06-22 16:27 ` Icenowy Zheng
2018-06-24 16:34 ` Harald Geyer
2018-06-25 7:43 ` Arend van Spriel
2018-06-25 7:47 ` Icenowy Zheng
2018-06-25 8:13 ` Arend van Spriel
2018-06-25 10:42 ` Icenowy Zheng
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=20180315162510.11669-3-harald@ccbib.org \
--to=harald@ccbib.org \
--cc=andre.przywara@arm.com \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=icenowy@aosc.io \
--cc=info@olimex.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=robh+dt@kernel.org \
--cc=wens@csie.org \
--cc=will.deacon@arm.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
all inboxes | Powered by JetHome®