diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2012-07-30 10:03:16 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-08-23 23:44:11 -0400 |
commit | 03b276505435927b5c4f7d246557a991fbedad92 (patch) | |
tree | 18f3a41bd6db9d5cfb023b438c4e37284fefa11e /arch/arm/boot/dts/imx6q.dtsi | |
parent | a9d1f92407a2114aff580a2e28803d64b4c437e0 (diff) |
ARM: dts: imx: Always enable the watchdog
Instead of enabling the watchdog in each individual dts file, select in
the SoC dtsi file instead.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6q.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index fd57079f71a9..a8cd96eed298 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi | |||
@@ -362,7 +362,6 @@ | |||
362 | compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt"; | 362 | compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt"; |
363 | reg = <0x020bc000 0x4000>; | 363 | reg = <0x020bc000 0x4000>; |
364 | interrupts = <0 80 0x04>; | 364 | interrupts = <0 80 0x04>; |
365 | status = "disabled"; | ||
366 | }; | 365 | }; |
367 | 366 | ||
368 | wdog@020c0000 { /* WDOG2 */ | 367 | wdog@020c0000 { /* WDOG2 */ |