diff options
| author | Jisheng Zhang <jszhang@marvell.com> | 2016-07-06 02:41:39 -0400 |
|---|---|---|
| committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2016-09-28 14:34:45 -0400 |
| commit | 684da56f7cf08012f23eb57ecd8846cf0f77a93b (patch) | |
| tree | 32ab66fea7becd5f6a73d3f65c5cfc4a1086b0ec /arch/arm/boot | |
| parent | 29b4817d4018df78086157ea3a55c1d9424a7cfc (diff) | |
arm: dts: berlin2: 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>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/berlin2.dtsi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi index ae81009741ff..15c857aa796e 100644 --- a/arch/arm/boot/dts/berlin2.dtsi +++ b/arch/arm/boot/dts/berlin2.dtsi | |||
| @@ -447,7 +447,6 @@ | |||
| 447 | reg = <0x2000 0x100>; | 447 | reg = <0x2000 0x100>; |
| 448 | clocks = <&refclk>; | 448 | clocks = <&refclk>; |
| 449 | interrupts = <1>; | 449 | interrupts = <1>; |
| 450 | status = "disabled"; | ||
| 451 | }; | 450 | }; |
| 452 | 451 | ||
| 453 | wdt2: watchdog@3000 { | 452 | wdt2: watchdog@3000 { |
| @@ -455,7 +454,6 @@ | |||
| 455 | reg = <0x3000 0x100>; | 454 | reg = <0x3000 0x100>; |
| 456 | clocks = <&refclk>; | 455 | clocks = <&refclk>; |
| 457 | interrupts = <2>; | 456 | interrupts = <2>; |
| 458 | status = "disabled"; | ||
| 459 | }; | 457 | }; |
| 460 | 458 | ||
| 461 | sm_gpio1: gpio@5000 { | 459 | sm_gpio1: gpio@5000 { |