From 1aeeeed154d17e901eb5b3b44de2e3d95a4a8095 Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Thu, 3 Jul 2008 23:51:34 -0700 Subject: [PATCH] --- yaml --- r: 107860 b: refs/heads/master c: 28acd02f9f9efe44718de3bbe8be22d6dfb7e47f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/Kconfig | 11 +++++++++-- trunk/drivers/watchdog/Makefile | 2 +- .../drivers/watchdog/{mpc83xx_wdt.c => mpc8xxx_wdt.c} | 0 4 files changed, 11 insertions(+), 4 deletions(-) rename trunk/drivers/watchdog/{mpc83xx_wdt.c => mpc8xxx_wdt.c} (100%) diff --git a/[refs] b/[refs] index ac542c4b7a35..48efa79f526f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 500c919e3d699644cc9d6c1e93022481baafd8e1 +refs/heads/master: 28acd02f9f9efe44718de3bbe8be22d6dfb7e47f diff --git a/trunk/drivers/watchdog/Kconfig b/trunk/drivers/watchdog/Kconfig index 93329620f447..01e33e80eac0 100644 --- a/trunk/drivers/watchdog/Kconfig +++ b/trunk/drivers/watchdog/Kconfig @@ -695,9 +695,16 @@ config 8xx_WDT tristate "MPC8xx Watchdog Timer" depends on 8xx -config 83xx_WDT - tristate "MPC83xx/MPC86xx Watchdog Timer" +config 8xxx_WDT + tristate "MPC8xxx Platform Watchdog Timer" depends on PPC_83xx || PPC_86xx + help + This driver is for a SoC level watchdog that exists on some + Freescale PowerPC processors. So far this driver supports: + - MPC83xx watchdogs + - MPC86xx watchdogs + + For BookE processors (MPC85xx) use the BOOKE_WDT driver instead. config MV64X60_WDT tristate "MV64X60 (Marvell Discovery) Watchdog Timer" diff --git a/trunk/drivers/watchdog/Makefile b/trunk/drivers/watchdog/Makefile index edd305a64e63..cdd674ffaa21 100644 --- a/trunk/drivers/watchdog/Makefile +++ b/trunk/drivers/watchdog/Makefile @@ -103,7 +103,7 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o # POWERPC Architecture obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o -obj-$(CONFIG_83xx_WDT) += mpc83xx_wdt.o +obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o diff --git a/trunk/drivers/watchdog/mpc83xx_wdt.c b/trunk/drivers/watchdog/mpc8xxx_wdt.c similarity index 100% rename from trunk/drivers/watchdog/mpc83xx_wdt.c rename to trunk/drivers/watchdog/mpc8xxx_wdt.c