aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Miao <eric.miao@linaro.org>2011-12-30 21:32:44 +0800
committerEric Miao <eric.miao@linaro.org>2012-01-11 13:57:13 +0800
commit462d4b16c2192a8b6d708668a206a303e3763927 (patch)
treebe98256de3a71fab7b83d1bb46748aef3c48ce53
parentf6634cfbe522fd2d09e7543ae6f5c00a04e8b9bd (diff)
downloadlinux-linaro-462d4b16c2192a8b6d708668a206a303e3763927.tar.gz
imx6q: add support for watchdog using imx2_wdt.c
Signed-off-by: Eric Miao <eric.miao@linaro.org>
-rw-r--r--arch/arm/boot/dts/imx6q-sabrelite.dts6
-rw-r--r--drivers/watchdog/Kconfig2
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index 08d920de728..fbe43d6cf37 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -22,6 +22,12 @@
};
soc {
+ aips-bus@02000000 { /* AIPS1 */
+ wdog@020bc000 { /* WDOG1 */
+ status = "okay";
+ };
+ };
+
aips-bus@02100000 { /* AIPS2 */
enet@02188000 {
phy-mode = "rgmii";
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 79fd606b7cd..7c3064552ef 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -333,7 +333,7 @@ config MAX63XX_WATCHDOG
config IMX2_WDT
tristate "IMX2+ Watchdog"
- depends on IMX_HAVE_PLATFORM_IMX2_WDT
+ depends on IMX_HAVE_PLATFORM_IMX2_WDT || SOC_IMX6Q
help
This is the driver for the hardware watchdog
on the Freescale IMX2 and later processors.