Skip to contentSkip to conversation

mpc52xx/wdt: remove obsolete old WDT implementation

PATCH In review Albrecht Dreß 5 participants 6 messages Nov 12, 2009 Watchdog device drivers

lore
Share & tools
lore

Albrecht Dreß

author
#0 lore raw

PATCH v2 3/3 mpc52xx/wdt: remove obsolete old WDT implementation

Remove the old WDT implementation.

Signed-off-by Albrecht Dreß <[email protected]>

---

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(-)
drivers/watchdog/Kconfig +3 -1
index 3711b88..d958b76 100644
@@ -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"
drivers/watchdog/Makefile +0 -1
index 699199b..89c045d 100644
@@ -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
Acked-by on v2 3/3
#1 lore raw
Quoted 3 lines · Albrecht Dreß

Remove the old WDT implementation.

Signed-off-by Albrecht Dreß <[email protected]>
Acked-by Grant Likely <[email protected]>

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.

Quoted 41 lines

---

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(-)
drivers/watchdog/Kconfig +0 -0
index 3711b88..d958b76 100644
@@ -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"

drivers/watchdog/Makefile +0 -0
index 699199b..89c045d 100644
@@ -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

Signature · 2 lines
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
#2 lore raw
In reply to Albrecht Dreß
Quoted 9 lines · Albrecht Dreß

Remove the old WDT implementation.

Signed-off-by Albrecht Dreß <[email protected]>

---

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 :)

Quoted 10 lines
 drivers/watchdog/Kconfig  |    4 +++-
 drivers/watchdog/Makefile |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/watchdog/Kconfig +0 -0
index 3711b88..d958b76 100644

drivers/watchdog/Kconfig config GEF_WDT · line 867

Quoted 8 lines
drivers/watchdog/Kconfig +3 -1
@@ -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.

Quoted 20 lines
drivers/watchdog/Kconfig +0 -0
 config 8xxx_WDT
 	tristate "MPC8xxx Platform Watchdog Timer"
drivers/watchdog/Makefile +0 -1
index 699199b..89c045d 100644
@@ -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-uLR06cmDAlY/[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev

Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

_______________________________________________
devicetree-discuss mailing list devicetree-discuss-uLR06cmDAlY/[email protected]
https://lists.ozlabs.org/listinfo/devicetree-discuss

author
#3 lore raw

Hi Wolfram:

Am 12.11.09 20:56 schrieb(en) Wolfram Sang:

Quoted 3 lines
Quoted 1 line

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?

Quoted 8 lines

drivers/watchdog/Kconfig config GEF_WDT · line 867

Quoted 6 lines

config MPC5200_WDT

drivers/watchdog/Kconfig +3 -1
-	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.

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev

#4 lore raw
Quoted 20 lines · Albrecht Dreß

Hi Wolfram:

Am 12.11.09 20:56 schrieb(en) Wolfram Sang:

Quoted 5 lines
Quoted 3 lines

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?

Quoted 7 lines
Quoted 6 lines

 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.

Quoted 5 lines
Quoted 1 line

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?

I don't care. Don't bother respinning just for this.

g.

Signature · 2 lines
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
#5 lore raw
In reply to Albrecht Dreß
Quoted 11 lines · Albrecht Dreß

Hi Wolfram:

Am 12.11.09 20:56 schrieb(en) Wolfram Sang:

Quoted 4 lines
Quoted 2 lines

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.

Quoted 3 lines

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

Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev