rk3288: add watchdot support

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 95813da0e4936c201232b0ace449d133395d0aa5..286e0181d7b488d82cde47096fc86e0b27d08d0b 100755 (executable)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -231,6 +231,19 @@
                rockchip,count-up = <1>;
        };
 
+       watchdog:wdt@2004c000 {
+               compatible = "rockchip,watch dog";
+               reg = <0xff800000 0x100>;
+               clocks = <&pclk_pd_alive>;
+               clock-names = "pclk_wdt";
+               interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+               rockchip,irq = <0>;
+               rockchip,timeout = <60>;
+               rockchip,atboot = <1>;
+               rockchip,debug = <0>;
+               status = "disable";
+       };
+
     amba {
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index d165a255759533e59c81348a652293c032427537..e89fc313397233bf80a7d210d8b0db2a36492314 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -107,31 +107,6 @@ config WM8350_WATCHDOG
 
 # ARM Architecture
 
-config RK29_WATCHDOG
-       tristate "RK29 watchdog"
-       help
-         Watchdog timer embedded into RK29xx chips. This will reboot your
-         system when the timeout is reached.
-
-config RK29_FEED_DOG_BY_INTE
-       bool "feed watchdog by interrupt"
-       depends on RK29_WATCHDOG
-
-config RK29_WATCHDOG_ATBOOT
-       bool "start watchdog at system boot"
-       depends on RK29_WATCHDOG
-
-config RK29_WATCHDOG_DEFAULT_TIME
-       int "set watchdog time out value (unit second)"
-       default 0
-       depends on RK29_WATCHDOG
-       help
-         the real time out value is two times more than the setting value
-
-config RK29_WATCHDOG_DEBUG
-       bool "enable watchdog debug"
-       depends on RK29_WATCHDOG
-
 config ARM_SP805_WATCHDOG
        tristate "ARM SP805 Watchdog"
        depends on ARM && ARM_AMBA

diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 63ad0297c06f9cfb0e5dc87d77254bb70b7c1c67..7fe3d99052f2a117b10e053e70d65ed8aefb589b 100644 (file)
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -50,7 +50,7 @@ obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
 obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
 obj-$(CONFIG_STMP3XXX_RTC_WATCHDOG) += stmp3xxx_rtc_wdt.o
 obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
-obj-$(CONFIG_RK29_WATCHDOG) += rk29_wdt.o
+obj-$(CONFIG_ARCH_ROCKCHIP) += rk29_wdt.o
 obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
 obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
 obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o

diff --git a/drivers/watchdog/rk29_wdt.c b/drivers/watchdog/rk29_wdt.c
index 990b6d1455755b842027a7c095e836cc324255cc..78af00773a81c03bbfef57c5694cfb9dbe8ff824 100644 (file)
--- a/drivers/watchdog/rk29_wdt.c
+++ b/drivers/watchdog/rk29_wdt.c
@@ -75,7 +75,7 @@
 */\r
 \r
 static int nowayout    = WATCHDOG_NOWAYOUT;\r
-static int tmr_margin  = CONFIG_RK29_WATCHDOG_DEFAULT_TIME;\r
+static int tmr_margin  = 100;//CONFIG_RK29_WATCHDOG_DEFAULT_TIME;\r
 #ifdef CONFIG_RK29_WATCHDOG_ATBOOT\r
 static int tmr_atboot  = 1;\r
 #else\r