diff options
author | Jisheng Zhang <jszhang@marvell.com> | 2016-07-06 02:41:40 -0400 |
---|---|---|
committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2016-09-28 14:34:55 -0400 |
commit | b009cb358e0ea736972e97e3873f26f39a9b9697 (patch) | |
tree | 7f9e0c304b24d5e0d5aa9e9de5c786424ade1d50 | |
parent | 684da56f7cf08012f23eb57ecd8846cf0f77a93b (diff) |
arm: dts: berlin2q: enable all wdt nodes unconditionally
After commit f29a72c24ad4 ("watchdog: dw_wdt: Convert to use watchdog
infrastructure"), the dw_wdt driver can support multiple variants, so
unconditionally enable all dw_wdt nodes now.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
-rw-r--r-- | arch/arm/boot/dts/berlin2q.dtsi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi index 2c34bfb13632..7e61d04da769 100644 --- a/arch/arm/boot/dts/berlin2q.dtsi +++ b/arch/arm/boot/dts/berlin2q.dtsi | |||
@@ -525,7 +525,6 @@ | |||
525 | reg = <0x2000 0x100>; | 525 | reg = <0x2000 0x100>; |
526 | clocks = <&refclk>; | 526 | clocks = <&refclk>; |
527 | interrupts = <1>; | 527 | interrupts = <1>; |
528 | status = "disabled"; | ||
529 | }; | 528 | }; |
530 | 529 | ||
531 | wdt2: watchdog@3000 { | 530 | wdt2: watchdog@3000 { |
@@ -533,7 +532,6 @@ | |||
533 | reg = <0x3000 0x100>; | 532 | reg = <0x3000 0x100>; |
534 | clocks = <&refclk>; | 533 | clocks = <&refclk>; |
535 | interrupts = <2>; | 534 | interrupts = <2>; |
536 | status = "disabled"; | ||
537 | }; | 535 | }; |
538 | 536 | ||
539 | sm_gpio1: gpio@5000 { | 537 | sm_gpio1: gpio@5000 { |