From: Lars-Peter Clausen <lars@metafoo.de>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: Guenter Roeck <linux@roeck-us.net>,
Wim Van Sebroeck <wim@iguana.be>,
Paul Burton <paul.burton@imgtec.com>,
Paul Cercueil <paul@crapouillou.net>,
Maarten ter Huurne <maarten@treewalker.org>,
linux-mips@linux-mips.org, linux-watchdog@vger.kernel.org,
Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 2/3] MIPS: qi_lb60: Register watchdog device
Date: Sat, 10 Jan 2015 19:29:09 +0100 [thread overview]
Message-ID: <1420914550-18335-2-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1420914550-18335-1-git-send-email-lars@metafoo.de>
The next commit will move the restart code to the watchdog driver. So for
restart to continue to work we need to register the watchdog device.
Also enable the watchdog driver in the default config.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
arch/mips/configs/qi_lb60_defconfig | 2 ++
arch/mips/jz4740/board-qi_lb60.c | 1 +
2 files changed, 3 insertions(+)
diff --git a/arch/mips/configs/qi_lb60_defconfig b/arch/mips/configs/qi_lb60_defconfig
index 2b96547..ce06a92 100644
--- a/arch/mips/configs/qi_lb60_defconfig
+++ b/arch/mips/configs/qi_lb60_defconfig
@@ -73,6 +73,8 @@ CONFIG_POWER_SUPPLY=y
CONFIG_BATTERY_JZ4740=y
CONFIG_CHARGER_GPIO=y
# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_JZ4740_WDT=y
CONFIG_MFD_JZ4740_ADC=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c
index c454525..a00f134 100644
--- a/arch/mips/jz4740/board-qi_lb60.c
+++ b/arch/mips/jz4740/board-qi_lb60.c
@@ -436,6 +436,7 @@ static struct gpiod_lookup_table qi_lb60_audio_gpio_table = {
};
static struct platform_device *jz_platform_devices[] __initdata = {
+ &jz4740_wdt_device,
&jz4740_udc_device,
&jz4740_udc_xceiv_device,
&jz4740_mmc_device,
--
1.7.10.4
next prev parent reply other threads:[~2015-01-10 18:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-10 18:29 [PATCH 1/3] MIPS: Use do_kernel_restart() as the default restart handler Lars-Peter Clausen
2015-01-10 18:29 ` Lars-Peter Clausen [this message]
2015-01-11 1:24 ` [PATCH 2/3] MIPS: qi_lb60: Register watchdog device Guenter Roeck
2015-01-11 1:37 ` Maarten ter Huurne
2015-01-11 16:17 ` Guenter Roeck
2015-01-10 18:29 ` [PATCH 3/3] MIPS: jz4740: Move reset code to the watchdog driver Lars-Peter Clausen
2015-01-11 1:18 ` Guenter Roeck
2015-01-11 1:43 ` Maarten ter Huurne
2015-01-11 9:41 ` Lars-Peter Clausen
2015-01-11 16:16 ` Guenter Roeck
2015-01-10 20:08 ` [PATCH 1/3] MIPS: Use do_kernel_restart() as the default restart handler Måns Rullgård
2015-01-11 1:19 ` Guenter Roeck
2015-01-11 12:15 ` Måns Rullgård
2015-01-11 12:25 ` Lars-Peter Clausen
2015-01-11 12:30 ` Måns Rullgård
2015-01-11 12:41 ` Lars-Peter Clausen
2015-01-11 12:45 ` Måns Rullgård
2015-01-11 16:13 ` Guenter Roeck
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=1420914550-18335-2-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=linux-mips@linux-mips.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=maarten@treewalker.org \
--cc=paul.burton@imgtec.com \
--cc=paul@crapouillou.net \
--cc=ralf@linux-mips.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