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 tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
at91sam9260.dtsi
diff --git
a/arch/arm/boot/dts/at91sam9260.dtsi
b/arch/arm/boot/dts/at91sam9260.dtsi
index b1d3fab60e0a9bf7df64de7cb1adcc45daaa95fa..c528b4b429b96efa5f3473fe4f8287711e6d2e56 100644
(file)
--- a/
arch/arm/boot/dts/at91sam9260.dtsi
+++ b/
arch/arm/boot/dts/at91sam9260.dtsi
@@
-479,6
+479,12
@@
trigger-external;
};
};
+
+ watchdog@fffffd40 {
+ compatible = "atmel,at91sam9260-wdt";
+ reg = <0xfffffd40 0x10>;
+ status = "disabled";
+ };
};
nand0: nand@40000000 {