* [PATCHv2 3/3] mpc52xx/wdt: remove obsolete old WDT implementation
@ 2009-11-12 18:45 Albrecht Dreß
2009-11-12 19:14 ` Grant Likely
2009-11-12 19:56 ` Wolfram Sang
0 siblings, 2 replies; 6+ messages in thread
From: Albrecht Dreß @ 2009-11-12 18:45 UTC (permalink / raw)
To: Likely, Grant, Linux PPC Development, Devicetree Discussions,
Wim Van Sebroeck
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCHv2 3/3] mpc52xx/wdt: remove obsolete old WDT implementation
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:56 ` Wolfram Sang
1 sibling, 0 replies; 6+ messages in thread
From: Grant Likely @ 2009-11-12 19:14 UTC (permalink / raw)
To: Albrecht Dreß
Cc: Linux PPC Development, Devicetree Discussions, Wim Van Sebroeck
On Thu, Nov 12, 2009 at 11:45 AM, Albrecht Dre=DF <albrecht.dress@arcor.de>=
wrote:
> Remove the old WDT implementation.
>
> Signed-off-by: Albrecht Dre=DF <albrecht.dress@arcor.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Wim, I'm picking up the other 2 patches into my tree. Do you want me
to push this patch through my tree, or do you want to pick it up?
g.
> ---
>
> 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.
>
> =A0drivers/watchdog/Kconfig =A0| =A0 =A04 +++-
> =A0drivers/watchdog/Makefile | =A0 =A01 -
> =A02 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
> =A0 =A0 =A0 =A0 =A0Watchdog timer found in a number of GE Fanuc single bo=
ard computers.
>
> =A0config MPC5200_WDT
> - =A0 =A0 =A0 tristate "MPC5200 Watchdog Timer"
> + =A0 =A0 =A0 bool "MPC52xx Watchdog Timer"
> =A0 =A0 =A0 =A0depends on PPC_MPC52xx
> + =A0 =A0 =A0 help
> + =A0 =A0 =A0 =A0 Use General Purpose Timer (GPT) 0 on the MPC5200 as Wat=
chdog.
>
> =A0config 8xxx_WDT
> =A0 =A0 =A0 =A0tristate "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
>
> =A0# POWERPC Architecture
> =A0obj-$(CONFIG_GEF_WDT) +=3D gef_wdt.o
> -obj-$(CONFIG_MPC5200_WDT) +=3D mpc5200_wdt.o
> =A0obj-$(CONFIG_8xxx_WDT) +=3D mpc8xxx_wdt.o
> =A0obj-$(CONFIG_MV64X60_WDT) +=3D mv64x60_wdt.o
> =A0obj-$(CONFIG_PIKA_WDT) +=3D pika_wdt.o
>
>
--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv2 3/3] mpc52xx/wdt: remove obsolete old WDT implementation
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:56 ` Wolfram Sang
2009-11-12 20:36 ` Albrecht Dreß
1 sibling, 1 reply; 6+ messages in thread
From: Wolfram Sang @ 2009-11-12 19:56 UTC (permalink / raw)
To: Albrecht Dreß
Cc: Linux PPC Development, Devicetree Discussions, Wim Van Sebroeck
[-- Attachment #1: Type: text/plain, Size: 1966 bytes --]
On Thu, Nov 12, 2009 at 07:45:20PM +0100, Albrecht Dreß wrote:
> 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.
Ehrm, this is possible within a patch :)
>
> 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.
s/5200/52xx/ here too.
>
> 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
>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv2 3/3] mpc52xx/wdt: remove obsolete old WDT implementation
2009-11-12 19:56 ` Wolfram Sang
@ 2009-11-12 20:36 ` Albrecht Dreß
2009-11-12 20:43 ` Grant Likely
2009-11-12 20:47 ` Wolfram Sang
0 siblings, 2 replies; 6+ messages in thread
From: Albrecht Dreß @ 2009-11-12 20:36 UTC (permalink / raw)
To: Wolfram Sang
Cc: Linux PPC Development, Devicetree Discussions, Wim Van Sebroeck
[-- Attachment #1: Type: text/plain, Size: 880 bytes --]
Hi Wolfram:
Am 12.11.09 20:56 schrieb(en) Wolfram Sang:
> > Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and should be removed.
>
> Ehrm, this is possible within a patch :)
Ummm, I tried that (removed the file from git locally), but apparently I'm too dumb to find the proper options to get this into the diff (to my defence, I'm still using cvs/svn for my projects). Can you give me a hint?
> > 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.
>
> s/5200/52xx/ here too.
Yes, you're right. The config option should still be 'MPC5200_WDT', though, as otherwise all the default configs had to be touched - IMO, on the low level, this does no harm. Thoughts?
Cheers, Albrecht.
[-- Attachment #2: Type: application/pgp-signature, Size: 190 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv2 3/3] mpc52xx/wdt: remove obsolete old WDT implementation
2009-11-12 20:36 ` Albrecht Dreß
@ 2009-11-12 20:43 ` Grant Likely
2009-11-12 20:47 ` Wolfram Sang
1 sibling, 0 replies; 6+ messages in thread
From: Grant Likely @ 2009-11-12 20:43 UTC (permalink / raw)
To: Albrecht Dreß
Cc: Linux PPC Development, Devicetree Discussions, Wim Van Sebroeck
On Thu, Nov 12, 2009 at 1:36 PM, Albrecht Dre=DF <albrecht.dress@arcor.de> =
wrote:
> Hi Wolfram:
>
> Am 12.11.09 20:56 schrieb(en) Wolfram Sang:
>>
>> > Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and shou=
ld
>> > be removed.
>>
>> Ehrm, this is possible within a patch :)
>
> Ummm, I tried that (removed the file from git locally), but apparently I'=
m
> too dumb to find the proper options to get this into the diff (to my
> defence, I'm still using cvs/svn for my projects). =A0Can you give me a h=
int?
>
>> > =A0config MPC5200_WDT
>> > - =A0 =A0 tristate "MPC5200 Watchdog Timer"
>> > + =A0 =A0 bool "MPC52xx Watchdog Timer"
>> > =A0 =A0 =A0 depends on PPC_MPC52xx
>> > + =A0 =A0 help
>> > + =A0 =A0 =A0 Use General Purpose Timer (GPT) 0 on the MPC5200 as Watc=
hdog.
>>
>> s/5200/52xx/ here too.
>
> Yes, you're right. =A0The config option should still be 'MPC5200_WDT', th=
ough,
> as otherwise all the default configs had to be touched - IMO, on the low
> level, this does no harm. =A0Thoughts?
I don't care. Don't bother respinning just for this.
g.
--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv2 3/3] mpc52xx/wdt: remove obsolete old WDT implementation
2009-11-12 20:36 ` Albrecht Dreß
2009-11-12 20:43 ` Grant Likely
@ 2009-11-12 20:47 ` Wolfram Sang
1 sibling, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2009-11-12 20:47 UTC (permalink / raw)
To: Albrecht Dreß
Cc: Linux PPC Development, Devicetree Discussions, Wim Van Sebroeck
[-- Attachment #1: Type: text/plain, Size: 1152 bytes --]
On Thu, Nov 12, 2009 at 09:36:42PM +0100, Albrecht Dreß wrote:
> Hi Wolfram:
>
> Am 12.11.09 20:56 schrieb(en) Wolfram Sang:
>> > Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and should
>> > be removed.
>>
>> Ehrm, this is possible within a patch :)
>
> Ummm, I tried that (removed the file from git locally), but apparently I'm
> too dumb to find the proper options to get this into the diff (to my defence,
> I'm still using cvs/svn for my projects). Can you give me a hint?
git rm file
You can even do this after you removed the file using rm already. 'git status'
gives you an overview about the current changes and how to add them to the
commit.
> Yes, you're right. The config option should still be 'MPC5200_WDT', though,
> as otherwise all the default configs had to be touched - IMO, on the low
> level, this does no harm. Thoughts?
I'd also leave the config name. But the help text should match the prompt :)
Regards,
Wolfram
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-11-12 20:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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:56 ` Wolfram Sang
2009-11-12 20:36 ` Albrecht Dreß
2009-11-12 20:43 ` Grant Likely
2009-11-12 20:47 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).