Commit bdcff345 authored by Andrew Victor's avatar Andrew Victor Committed by Wim Van Sebroeck

[WATCHDOG] Atmel AT91RM9200 rename.

The new Atmel AT91SAM9261 and AT91SAM9260 processors use a different
internal watchdog peripheral.  This watchdog driver is therefore
AT91RM9200-specific.

This patch renames at91_wdt.c to at91rm9200_wdt.c, and changes the name
of the configuration option.
Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 2db02c0f
...@@ -577,7 +577,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y ...@@ -577,7 +577,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
# Watchdog Device Drivers # Watchdog Device Drivers
# #
# CONFIG_SOFT_WATCHDOG is not set # CONFIG_SOFT_WATCHDOG is not set
CONFIG_AT91_WATCHDOG=y CONFIG_AT91RM9200_WATCHDOG=y
# #
# USB-based Watchdog Cards # USB-based Watchdog Cards
......
...@@ -558,7 +558,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y ...@@ -558,7 +558,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
# Watchdog Device Drivers # Watchdog Device Drivers
# #
# CONFIG_SOFT_WATCHDOG is not set # CONFIG_SOFT_WATCHDOG is not set
CONFIG_AT91_WATCHDOG=y CONFIG_AT91RM9200_WATCHDOG=y
# #
# USB-based Watchdog Cards # USB-based Watchdog Cards
......
...@@ -615,7 +615,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y ...@@ -615,7 +615,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
# Watchdog Device Drivers # Watchdog Device Drivers
# #
# CONFIG_SOFT_WATCHDOG is not set # CONFIG_SOFT_WATCHDOG is not set
CONFIG_AT91_WATCHDOG=y CONFIG_AT91RM9200_WATCHDOG=y
# #
# USB-based Watchdog Cards # USB-based Watchdog Cards
......
...@@ -615,7 +615,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y ...@@ -615,7 +615,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
# Watchdog Device Drivers # Watchdog Device Drivers
# #
# CONFIG_SOFT_WATCHDOG is not set # CONFIG_SOFT_WATCHDOG is not set
CONFIG_AT91_WATCHDOG=y CONFIG_AT91RM9200_WATCHDOG=y
# #
# USB-based Watchdog Cards # USB-based Watchdog Cards
......
...@@ -560,7 +560,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y ...@@ -560,7 +560,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
# Watchdog Device Drivers # Watchdog Device Drivers
# #
# CONFIG_SOFT_WATCHDOG is not set # CONFIG_SOFT_WATCHDOG is not set
CONFIG_AT91_WATCHDOG=y CONFIG_AT91RM9200_WATCHDOG=y
# CONFIG_NVRAM is not set # CONFIG_NVRAM is not set
# CONFIG_DTLK is not set # CONFIG_DTLK is not set
# CONFIG_R3964 is not set # CONFIG_R3964 is not set
......
...@@ -607,7 +607,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y ...@@ -607,7 +607,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
# Watchdog Device Drivers # Watchdog Device Drivers
# #
# CONFIG_SOFT_WATCHDOG is not set # CONFIG_SOFT_WATCHDOG is not set
CONFIG_AT91_WATCHDOG=y CONFIG_AT91RM9200_WATCHDOG=y
# #
# USB-based Watchdog Cards # USB-based Watchdog Cards
......
...@@ -60,7 +60,7 @@ config SOFT_WATCHDOG ...@@ -60,7 +60,7 @@ config SOFT_WATCHDOG
# ARM Architecture # ARM Architecture
config AT91_WATCHDOG config AT91RM9200_WATCHDOG
tristate "AT91RM9200 watchdog" tristate "AT91RM9200 watchdog"
depends on WATCHDOG && ARCH_AT91RM9200 depends on WATCHDOG && ARCH_AT91RM9200
help help
......
...@@ -23,7 +23,7 @@ obj-$(CONFIG_WDTPCI) += wdt_pci.o ...@@ -23,7 +23,7 @@ obj-$(CONFIG_WDTPCI) += wdt_pci.o
obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
# ARM Architecture # ARM Architecture
obj-$(CONFIG_AT91_WATCHDOG) += at91_wdt.o obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o
obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o
obj-$(CONFIG_21285_WATCHDOG) += wdt285.o obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
obj-$(CONFIG_977_WATCHDOG) += wdt977.o obj-$(CONFIG_977_WATCHDOG) += wdt977.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment