diff options
author | Stefan Agner <stefan@agner.ch> | 2014-11-27 18:35:36 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2015-01-05 07:43:48 -0500 |
commit | c134e09fc59381ffd445922019b72aed998bdc8f (patch) | |
tree | 561929777eb63d60ed9b7ab45f659c562215b9cd | |
parent | 985782d1241718c632839a284d07e84be3bb344c (diff) |
ARM: dts: vf610: enable watchdog for Cortex-A5 dt's
During restructuring of the device tree files the watchdog was
changed to be disabled by default. However, since the watchdog
instance is dedicated to the Cortex-A5, enable the peripheral
by default in the base device tree vf500.dtsi.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r-- | arch/arm/boot/dts/vf500.dtsi | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/vfxxx.dtsi | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/vf500.dtsi b/arch/arm/boot/dts/vf500.dtsi index de6700542714..ea0f74f6eeb3 100644 --- a/arch/arm/boot/dts/vf500.dtsi +++ b/arch/arm/boot/dts/vf500.dtsi | |||
@@ -169,3 +169,8 @@ | |||
169 | &usbphy1 { | 169 | &usbphy1 { |
170 | interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>; | 170 | interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>; |
171 | }; | 171 | }; |
172 | |||
173 | &wdoga5 { | ||
174 | interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; | ||
175 | status = "okay"; | ||
176 | }; | ||
diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi index 505969ae8093..712646814cc6 100644 --- a/arch/arm/boot/dts/vfxxx.dtsi +++ b/arch/arm/boot/dts/vfxxx.dtsi | |||
@@ -184,7 +184,7 @@ | |||
184 | status = "disabled"; | 184 | status = "disabled"; |
185 | }; | 185 | }; |
186 | 186 | ||
187 | wdog@4003e000 { | 187 | wdoga5: wdog@4003e000 { |
188 | compatible = "fsl,vf610-wdt", "fsl,imx21-wdt"; | 188 | compatible = "fsl,vf610-wdt", "fsl,imx21-wdt"; |
189 | reg = <0x4003e000 0x1000>; | 189 | reg = <0x4003e000 0x1000>; |
190 | clocks = <&clks VF610_CLK_WDT>; | 190 | clocks = <&clks VF610_CLK_WDT>; |