]> git.karo-electronics.de Git - karo-tx-linux.git/commit
[ARM] 5390/1: AT91: Watchdog fixes
authorAndrew Victor <linux@maxim.org.za>
Wed, 11 Feb 2009 20:23:10 +0000 (21:23 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 14 Feb 2009 16:01:57 +0000 (16:01 +0000)
commit2af29b78618ac8b3a8746337002f108f8fdf56ad
tree576689b0beb8307d00d709f87a9f654efbb48a30
parent98ad6e3b1f5f2303815c063ece91291a597f6044
[ARM] 5390/1: AT91: Watchdog fixes

The recently merged AT91SAM9 watchdog driver uses the
AT91SAM9X_WATCHDOG config variable, whereas the original version of
the driver (and the platform support code) used AT91SAM9_WATCHDOG.
This causes the watchdog platform_device to never be registered, and
therefore the driver not to be initialized.

This patch:
- updates the platform support code to use AT91SAM9X_WATCHDOG.
- includes <linux/io.h> to fix compile error (same fix as was applied
to at91rm9200_wdt.c)
- fixes comment regarding watchdog clock-rates in at91rm9200.

Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
12 files changed:
arch/arm/configs/at91sam9260ek_defconfig
arch/arm/configs/at91sam9261ek_defconfig
arch/arm/configs/at91sam9263ek_defconfig
arch/arm/configs/at91sam9rlek_defconfig
arch/arm/configs/qil-a9260_defconfig
arch/arm/mach-at91/at91cap9_devices.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9261_devices.c
arch/arm/mach-at91/at91sam9263_devices.c
arch/arm/mach-at91/at91sam9rl_devices.c
drivers/watchdog/at91rm9200_wdt.c
drivers/watchdog/at91sam9_wdt.c