diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2007-11-23 11:20:27 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2008-01-29 05:14:58 -0500 |
| commit | 2064ba23e58daa929eec6f5e7a2abc24574a95b9 (patch) | |
| tree | 77967a6451b379f49a62c364e7ef352a0de50f5a /arch/mips/configs | |
| parent | 68efdb81c6c3b5c1df7169a4b460907198b19103 (diff) | |
[MIPS] TXx9 watchdog support for rbhma3100,rbhma4200,rbhma4500
This patch adds support for txx9wdt driver to rbhma3100, rbhma4200 and
rbhma4500 platform.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/configs')
| -rw-r--r-- | arch/mips/configs/jmr3927_defconfig | 15 | ||||
| -rw-r--r-- | arch/mips/configs/rbhma4200_defconfig | 15 | ||||
| -rw-r--r-- | arch/mips/configs/rbhma4500_defconfig | 15 |
3 files changed, 42 insertions, 3 deletions
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index eb96791c33ea..4ace37838993 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig | |||
| @@ -464,7 +464,6 @@ CONFIG_SERIAL_TXX9_STDSERIAL=y | |||
| 464 | CONFIG_LEGACY_PTYS=y | 464 | CONFIG_LEGACY_PTYS=y |
| 465 | CONFIG_LEGACY_PTY_COUNT=256 | 465 | CONFIG_LEGACY_PTY_COUNT=256 |
| 466 | # CONFIG_IPMI_HANDLER is not set | 466 | # CONFIG_IPMI_HANDLER is not set |
| 467 | # CONFIG_WATCHDOG is not set | ||
| 468 | # CONFIG_HW_RANDOM is not set | 467 | # CONFIG_HW_RANDOM is not set |
| 469 | # CONFIG_RTC is not set | 468 | # CONFIG_RTC is not set |
| 470 | # CONFIG_R3964 is not set | 469 | # CONFIG_R3964 is not set |
| @@ -482,6 +481,20 @@ CONFIG_DEVPORT=y | |||
| 482 | # CONFIG_W1 is not set | 481 | # CONFIG_W1 is not set |
| 483 | # CONFIG_POWER_SUPPLY is not set | 482 | # CONFIG_POWER_SUPPLY is not set |
| 484 | # CONFIG_HWMON is not set | 483 | # CONFIG_HWMON is not set |
| 484 | CONFIG_WATCHDOG=y | ||
| 485 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 486 | |||
| 487 | # | ||
| 488 | # Watchdog Device Drivers | ||
| 489 | # | ||
| 490 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 491 | CONFIG_TXX9_WDT=y | ||
| 492 | |||
| 493 | # | ||
| 494 | # PCI-based Watchdog Cards | ||
| 495 | # | ||
| 496 | # CONFIG_PCIPCWATCHDOG is not set | ||
| 497 | # CONFIG_WDTPCI is not set | ||
| 485 | 498 | ||
| 486 | # | 499 | # |
| 487 | # Multifunction device drivers | 500 | # Multifunction device drivers |
diff --git a/arch/mips/configs/rbhma4200_defconfig b/arch/mips/configs/rbhma4200_defconfig index 9383a598094b..a67c698a82d9 100644 --- a/arch/mips/configs/rbhma4200_defconfig +++ b/arch/mips/configs/rbhma4200_defconfig | |||
| @@ -431,7 +431,6 @@ CONFIG_UNIX98_PTYS=y | |||
| 431 | CONFIG_LEGACY_PTYS=y | 431 | CONFIG_LEGACY_PTYS=y |
| 432 | CONFIG_LEGACY_PTY_COUNT=256 | 432 | CONFIG_LEGACY_PTY_COUNT=256 |
| 433 | # CONFIG_IPMI_HANDLER is not set | 433 | # CONFIG_IPMI_HANDLER is not set |
| 434 | # CONFIG_WATCHDOG is not set | ||
| 435 | # CONFIG_HW_RANDOM is not set | 434 | # CONFIG_HW_RANDOM is not set |
| 436 | # CONFIG_RTC is not set | 435 | # CONFIG_RTC is not set |
| 437 | # CONFIG_R3964 is not set | 436 | # CONFIG_R3964 is not set |
| @@ -449,6 +448,20 @@ CONFIG_DEVPORT=y | |||
| 449 | # CONFIG_W1 is not set | 448 | # CONFIG_W1 is not set |
| 450 | # CONFIG_POWER_SUPPLY is not set | 449 | # CONFIG_POWER_SUPPLY is not set |
| 451 | # CONFIG_HWMON is not set | 450 | # CONFIG_HWMON is not set |
| 451 | CONFIG_WATCHDOG=y | ||
| 452 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 453 | |||
| 454 | # | ||
| 455 | # Watchdog Device Drivers | ||
| 456 | # | ||
| 457 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 458 | CONFIG_TXX9_WDT=m | ||
| 459 | |||
| 460 | # | ||
| 461 | # PCI-based Watchdog Cards | ||
| 462 | # | ||
| 463 | # CONFIG_PCIPCWATCHDOG is not set | ||
| 464 | # CONFIG_WDTPCI is not set | ||
| 452 | 465 | ||
| 453 | # | 466 | # |
| 454 | # Multifunction device drivers | 467 | # Multifunction device drivers |
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig index d1b56cc0fd7c..ebc8ad4c6439 100644 --- a/arch/mips/configs/rbhma4500_defconfig +++ b/arch/mips/configs/rbhma4500_defconfig | |||
| @@ -450,7 +450,6 @@ CONFIG_UNIX98_PTYS=y | |||
| 450 | CONFIG_LEGACY_PTYS=y | 450 | CONFIG_LEGACY_PTYS=y |
| 451 | CONFIG_LEGACY_PTY_COUNT=256 | 451 | CONFIG_LEGACY_PTY_COUNT=256 |
| 452 | # CONFIG_IPMI_HANDLER is not set | 452 | # CONFIG_IPMI_HANDLER is not set |
| 453 | # CONFIG_WATCHDOG is not set | ||
| 454 | # CONFIG_HW_RANDOM is not set | 453 | # CONFIG_HW_RANDOM is not set |
| 455 | # CONFIG_RTC is not set | 454 | # CONFIG_RTC is not set |
| 456 | # CONFIG_R3964 is not set | 455 | # CONFIG_R3964 is not set |
| @@ -479,6 +478,20 @@ CONFIG_SPI_AT25=y | |||
| 479 | # CONFIG_W1 is not set | 478 | # CONFIG_W1 is not set |
| 480 | # CONFIG_POWER_SUPPLY is not set | 479 | # CONFIG_POWER_SUPPLY is not set |
| 481 | # CONFIG_HWMON is not set | 480 | # CONFIG_HWMON is not set |
| 481 | CONFIG_WATCHDOG=y | ||
| 482 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 483 | |||
| 484 | # | ||
| 485 | # Watchdog Device Drivers | ||
| 486 | # | ||
| 487 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 488 | CONFIG_TXX9_WDT=m | ||
| 489 | |||
| 490 | # | ||
| 491 | # PCI-based Watchdog Cards | ||
| 492 | # | ||
| 493 | # CONFIG_PCIPCWATCHDOG is not set | ||
| 494 | # CONFIG_WDTPCI is not set | ||
| 482 | 495 | ||
| 483 | # | 496 | # |
| 484 | # Multifunction device drivers | 497 | # Multifunction device drivers |
