From: "Albrecht Dreß" <albrecht.dress@arcor.de>
To: "Likely, Grant" <grant.likely@secretlab.ca>,
Linux PPC Development <linuxppc-dev@ozlabs.org>,
Devicetree Discussions <devicetree-discuss@lists.ozlabs.org>,
Wim Van Sebroeck <wim@iguana.be>
Subject: [PATCHv2 3/3] mpc52xx/wdt: remove obsolete old WDT implementation
Date: Thu, 12 Nov 2009 19:45:20 +0100 [thread overview]
Message-ID: <1258051520.2280.3@antares> (raw)
Remove the old WDT implementation.
Signed-off-by: Albrecht Dre=DF <albrecht.dress@arcor.de>
---
Change against v1: WDT stuff now fully merged into the file
arch/powerpc/platforms/52xx/mpc52xx_gpt.c.
Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and should be=
removed.
drivers/watchdog/Kconfig | 4 +++-
drivers/watchdog/Makefile | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 3711b88..d958b76 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -861,8 +861,10 @@ config GEF_WDT
Watchdog timer found in a number of GE Fanuc single board computers.
=20
config MPC5200_WDT
- tristate "MPC5200 Watchdog Timer"
+ bool "MPC52xx Watchdog Timer"
depends on PPC_MPC52xx
+ help
+ Use General Purpose Timer (GPT) 0 on the MPC5200 as Watchdog.
=20
config 8xxx_WDT
tristate "MPC8xxx Platform Watchdog Timer"
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 699199b..89c045d 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -118,7 +118,6 @@ obj-$(CONFIG_TXX9_WDT) +=3D txx9wdt.o
=20
# POWERPC Architecture
obj-$(CONFIG_GEF_WDT) +=3D gef_wdt.o
-obj-$(CONFIG_MPC5200_WDT) +=3D mpc5200_wdt.o
obj-$(CONFIG_8xxx_WDT) +=3D mpc8xxx_wdt.o
obj-$(CONFIG_MV64X60_WDT) +=3D mv64x60_wdt.o
obj-$(CONFIG_PIKA_WDT) +=3D pika_wdt.o
WARNING: multiple messages have this Message-ID (diff)
From: "Albrecht Dreß" <albrecht.dress@arcor.de>
To: "Likely, Grant" <grant.likely@secretlab.ca>,
Linux PPC Development <linuxppc-dev@ozlabs.org>,
Devicetree Discussions <devicetree-discuss@lists.ozlabs.org>,
Wim Van Sebroeck <wim@iguana.be>
Subject: [PATCHv2 3/3] mpc52xx/wdt: remove obsolete old WDT implementation
Date: Thu, 12 Nov 2009 19:45:20 +0100 [thread overview]
Message-ID: <1258051520.2280.3@antares> (raw)
Remove the old WDT implementation.
Signed-off-by: Albrecht Dreß <albrecht.dress@arcor.de>
---
Change against v1: WDT stuff now fully merged into the file
arch/powerpc/platforms/52xx/mpc52xx_gpt.c.
Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and should be removed.
drivers/watchdog/Kconfig | 4 +++-
drivers/watchdog/Makefile | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 3711b88..d958b76 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -861,8 +861,10 @@ config GEF_WDT
Watchdog timer found in a number of GE Fanuc single board computers.
config MPC5200_WDT
- tristate "MPC5200 Watchdog Timer"
+ bool "MPC52xx Watchdog Timer"
depends on PPC_MPC52xx
+ help
+ Use General Purpose Timer (GPT) 0 on the MPC5200 as Watchdog.
config 8xxx_WDT
tristate "MPC8xxx Platform Watchdog Timer"
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 699199b..89c045d 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -118,7 +118,6 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
# POWERPC Architecture
obj-$(CONFIG_GEF_WDT) += gef_wdt.o
-obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o
obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
next reply other threads:[~2009-11-12 18:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-12 18:45 Albrecht Dreß [this message]
2009-11-12 18:45 ` [PATCHv2 3/3] mpc52xx/wdt: remove obsolete old WDT implementation Albrecht Dreß
2009-11-12 19:14 ` Grant Likely
2009-11-12 19:14 ` Grant Likely
2009-11-12 19:56 ` Wolfram Sang
2009-11-12 19:56 ` Wolfram Sang
2009-11-12 20:36 ` Albrecht Dreß
2009-11-12 20:36 ` Albrecht Dreß
2009-11-12 20:43 ` Grant Likely
2009-11-12 20:43 ` Grant Likely
2009-11-12 20:47 ` Wolfram Sang
2009-11-12 20:47 ` Wolfram Sang
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=1258051520.2280.3@antares \
--to=albrecht.dress@arcor.de \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=linuxppc-dev@ozlabs.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.