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 7/7] MIPS: jz4740: Drop old platform reset code |
From: | Paul Cercueil <paul@crapouillou.net> |
Date: | Thu, 28 Dec 2017 17:29:39 +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=1514478600; bh=6wZzSDGN9dgjjTr1ZctB1wZtKjOiXz+DEBtgKLDB2IU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=crq8vJPgaHdEF2S6q7Lh9jjeXKYnS4ZKAGeOb0CqV44uGf5EKhpZqRvv8esslY+EmRE0J87jZDHSXCyR1MP0Ked/fpGprWnMx9btHFd+Vd0Pct8JYOxvmRkkNUbsVt5na/i4ZP0kxgRsjef8QdQVFnxHSjbnPTT2kDF4nR2jJjE= |
In-reply-to: | <20171228162939.3928-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-1-paul@crapouillou.net> |
Sender: | linux-mips-bounce@linux-mips.org |
This work is now performed by the watchdog driver directly. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- arch/mips/jz4740/reset.c | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/arch/mips/jz4740/reset.c b/arch/mips/jz4740/reset.c index 67780c4b6573..5bf0cf44b55f 100644 --- a/arch/mips/jz4740/reset.c +++ b/arch/mips/jz4740/reset.c @@ -12,18 +12,9 @@ * */ -#include <linux/clk.h> -#include <linux/io.h> -#include <linux/kernel.h> -#include <linux/pm.h> - #include <asm/reboot.h> -#include <asm/mach-jz4740/base.h> -#include <asm/mach-jz4740/timer.h> - #include "reset.h" -#include "clock.h" static void jz4740_halt(void) { @@ -36,29 +27,7 @@ static void jz4740_halt(void) } } -#define JZ_REG_WDT_DATA 0x00 -#define JZ_REG_WDT_COUNTER_ENABLE 0x04 -#define JZ_REG_WDT_COUNTER 0x08 -#define JZ_REG_WDT_CTRL 0x0c - -static void jz4740_restart(char *command) -{ - void __iomem *wdt_base = ioremap(JZ4740_WDT_BASE_ADDR, 0x0f); - - jz4740_timer_enable_watchdog(); - - writeb(0, wdt_base + JZ_REG_WDT_COUNTER_ENABLE); - - writew(0, wdt_base + JZ_REG_WDT_COUNTER); - writew(0, wdt_base + JZ_REG_WDT_DATA); - writew(BIT(2), wdt_base + JZ_REG_WDT_CTRL); - - writeb(1, wdt_base + JZ_REG_WDT_COUNTER_ENABLE); - jz4740_halt(); -} - void jz4740_reset_init(void) { - _machine_restart = jz4740_restart; _machine_halt = jz4740_halt; } -- 2.11.0 |
<Prev in Thread] | Current Thread | [Next in Thread> |
---|---|---|
|
Previous by Date: | [PATCH 6/7] MIPS: qi_lb60: Enable the jz4740-wdt driver, Paul Cercueil |
---|---|
Next by Date: | Re: [PATCH v6 8/8] x86/kernel: jump_table: use relative references, Steven Rostedt |
Previous by Thread: | [PATCH 6/7] MIPS: qi_lb60: Enable the jz4740-wdt driver, Paul Cercueil |
Next by Thread: | [PATCH 3.2 82/94] MIPS: AR7: Ensure that serial ports are properly set up, Ben Hutchings |
Indexes: | [Date] [Thread] [Top] [All Lists] |