From: Paul Cercueil <paul@crapouillou.net>
To: Ralf Baechle <ralf@linux-mips.org>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Wim Van Sebroeck <wim@iguana.be>,
Guenter Roeck <linux@roeck-us.net>
Cc: devicetree@vger.kernel.org, linux-mips@linux-mips.org,
linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org,
Paul Cercueil <paul@crapouillou.net>
Subject: [PATCH v2 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver
Date: Sat, 30 Dec 2017 14:51:05 +0100 [thread overview]
Message-ID: <20171230135108.6834-5-paul@crapouillou.net> (raw)
In-Reply-To: <20171230135108.6834-1-paul@crapouillou.net>
Also remove the watchdog platform_device from platform.c, since it
wasn't used anywhere anyway.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
arch/mips/boot/dts/ingenic/jz4740.dtsi | 8 ++++++++
arch/mips/jz4740/platform.c | 16 ----------------
2 files changed, 8 insertions(+), 16 deletions(-)
v2: No change
diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi b/arch/mips/boot/dts/ingenic/jz4740.dtsi
index cd5185bb90ae..26c6b561d6f7 100644
--- a/arch/mips/boot/dts/ingenic/jz4740.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4740.dtsi
@@ -45,6 +45,14 @@
#clock-cells = <1>;
};
+ watchdog: watchdog@10002000 {
+ compatible = "ingenic,jz4740-watchdog";
+ reg = <0x10002000 0x10>;
+
+ clocks = <&cgu JZ4740_CLK_RTC>;
+ clock-names = "rtc";
+ };
+
rtc_dev: rtc@10003000 {
compatible = "ingenic,jz4740-rtc";
reg = <0x10003000 0x40>;
diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
index 5b7cdd67a9d9..cbc5f8e87230 100644
--- a/arch/mips/jz4740/platform.c
+++ b/arch/mips/jz4740/platform.c
@@ -233,22 +233,6 @@ struct platform_device jz4740_adc_device = {
.resource = jz4740_adc_resources,
};
-/* Watchdog */
-static struct resource jz4740_wdt_resources[] = {
- {
- .start = JZ4740_WDT_BASE_ADDR,
- .end = JZ4740_WDT_BASE_ADDR + 0x10 - 1,
- .flags = IORESOURCE_MEM,
- },
-};
-
-struct platform_device jz4740_wdt_device = {
- .name = "jz4740-wdt",
- .id = -1,
- .num_resources = ARRAY_SIZE(jz4740_wdt_resources),
- .resource = jz4740_wdt_resources,
-};
-
/* PWM */
struct platform_device jz4740_pwm_device = {
.name = "jz4740-pwm",
--
2.11.0
next prev parent reply other threads:[~2017-12-30 13:51 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-28 16:29 [PATCH 0/7] jz4740 watchdog driver & platform cleanups Paul Cercueil
2017-12-28 16:29 ` [PATCH 1/7] watchdog: JZ4740: Disable clock after stopping counter Paul Cercueil
2017-12-28 18:38 ` Guenter Roeck
2017-12-30 13:51 ` [PATCH v2 1/8] " Paul Cercueil
2017-12-30 13:51 ` [PATCH v2 2/8] watchdog: jz4740: Use devm_* functions Paul Cercueil
2017-12-30 16:08 ` Guenter Roeck
2017-12-30 13:51 ` [PATCH v2 3/8] watchdog: JZ4740: Register a restart handler Paul Cercueil
2018-01-20 7:31 ` PrasannaKumar Muralidharan
2018-01-20 15:45 ` Guenter Roeck
2018-01-20 16:04 ` PrasannaKumar Muralidharan
2018-01-20 17:56 ` Guenter Roeck
2017-12-30 13:51 ` [PATCH v2 4/8] watchdog: JZ4740: Drop module remove function Paul Cercueil
2017-12-30 16:08 ` Guenter Roeck
2018-01-20 7:41 ` PrasannaKumar Muralidharan
2018-01-20 15:50 ` Guenter Roeck
2018-01-20 15:59 ` PrasannaKumar Muralidharan
2017-12-30 13:51 ` Paul Cercueil [this message]
2018-01-02 16:37 ` [PATCH v2 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver PrasannaKumar Muralidharan
2018-01-02 16:48 ` Paul Cercueil
2018-01-03 4:46 ` Guenter Roeck
2018-01-03 12:01 ` Paul Cercueil
2018-01-03 14:28 ` PrasannaKumar Muralidharan
2017-12-30 13:51 ` [PATCH v2 6/8] MIPS: jz4780: dts: Fix watchdog node Paul Cercueil
2018-03-05 18:25 ` James Hogan
2017-12-30 13:51 ` [PATCH v2 7/8] MIPS: qi_lb60: Enable the jz4740-wdt driver Paul Cercueil
2018-03-05 18:28 ` James Hogan
2017-12-30 13:51 ` [PATCH v2 8/8] MIPS: jz4740: Drop old platform reset code Paul Cercueil
2018-03-05 18:31 ` James Hogan
2017-12-28 16:29 ` [PATCH 2/7] watchdog: jz4740: Use devm_* functions Paul Cercueil
2017-12-28 17:48 ` Guenter Roeck
2017-12-28 19:59 ` Paul Cercueil
2017-12-28 20:19 ` Guenter Roeck
2017-12-28 20:22 ` Paul Cercueil
2017-12-28 21:03 ` Guenter Roeck
2017-12-28 18:40 ` Guenter Roeck
2017-12-28 16:29 ` [PATCH 3/7] watchdog: JZ4740: Register a restart handler Paul Cercueil
2017-12-28 18:40 ` Guenter Roeck
2017-12-28 16:29 ` [PATCH 4/7] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver Paul Cercueil
2017-12-28 16:29 ` [PATCH 5/7] MIPS: jz4780: dts: Fix watchdog node Paul Cercueil
2017-12-28 17:33 ` Mathieu Malaterre
2017-12-28 16:29 ` [PATCH 6/7] MIPS: qi_lb60: Enable the jz4740-wdt driver Paul Cercueil
2017-12-28 16:29 ` [PATCH 7/7] MIPS: jz4740: Drop old platform reset code Paul Cercueil
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=20171230135108.6834-5-paul@crapouillou.net \
--to=paul@crapouillou.net \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mark.rutland@arm.com \
--cc=ralf@linux-mips.org \
--cc=robh+dt@kernel.org \
--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: 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