linux-mips
[Top] [All Lists]

[PATCH v2 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver

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>
Subject: [PATCH v2 5/8] MIPS: jz4740: dts: Add bindings for the jz4740-wdt driver
From: Paul Cercueil <paul@crapouillou.net>
Date: Sat, 30 Dec 2017 14:51:05 +0100
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>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1514641894; bh=LHdR+MCrl8GlK0LNLKnQzFPitITaSj1Ok6Ow4vWK9uE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=JxhtmMImukMiix0uU6XgvMOrym4cL+kzyDFJHG3xAPYwzj8iC3WBQrSgcUy9TMQ+cb2SYWvCL8LvLgqcC7vCnv9zXhNQnBXLzZ/6lC/f9dEloocF8SDOvQuveaIxPXgbVrF+yCy7BEPwwBLyInV5uWnU9rj7IPdz+IeXjY21rOs=
In-reply-to: <20171230135108.6834-1-paul@crapouillou.net>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20171228162939.3928-2-paul@crapouillou.net> <20171230135108.6834-1-paul@crapouillou.net>
Sender: linux-mips-bounce@linux-mips.org
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


<Prev in Thread] Current Thread [Next in Thread>