projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'regulator/fix/ab3100' and 'regulator/fix/s2mps11...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
at91sam9x5.dtsi
diff --git
a/arch/arm/boot/dts/at91sam9x5.dtsi
b/arch/arm/boot/dts/at91sam9x5.dtsi
index 6e5e9cfc3c4997f98af3b5608b743ddd97cd0d8d..174219de92fa7380d4e6dc8a2a9916fa05e70a6e 100644
(file)
--- a/
arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/
arch/arm/boot/dts/at91sam9x5.dtsi
@@
-754,6
+754,11
@@
watchdog@fffffe40 {
compatible = "atmel,at91sam9260-wdt";
reg = <0xfffffe40 0x10>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+ atmel,watchdog-type = "hardware";
+ atmel,reset-type = "all";
+ atmel,dbg-halt;
+ atmel,idle-halt;
status = "disabled";
};