summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2014-11-28 00:35:36 +0100
committerShawn Guo <shawn.guo@linaro.org>2015-01-05 20:43:48 +0800
commitc134e09fc59381ffd445922019b72aed998bdc8f (patch)
tree561929777eb63d60ed9b7ab45f659c562215b9cd
parent985782d1241718c632839a284d07e84be3bb344c (diff)
downloadblackbird-op-linux-c134e09fc59381ffd445922019b72aed998bdc8f.tar.gz
blackbird-op-linux-c134e09fc59381ffd445922019b72aed998bdc8f.zip
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.dtsi5
-rw-r--r--arch/arm/boot/dts/vfxxx.dtsi2
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 @@
&usbphy1 {
interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
};
+
+&wdoga5 {
+ interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+ status = "okay";
+};
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 @@
status = "disabled";
};
- wdog@4003e000 {
+ wdoga5: wdog@4003e000 {
compatible = "fsl,vf610-wdt", "fsl,imx21-wdt";
reg = <0x4003e000 0x1000>;
clocks = <&clks VF610_CLK_WDT>;
OpenPOWER on IntegriCloud