projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arc-4.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
meson8b.dtsi
diff --git
a/arch/arm/boot/dts/meson8b.dtsi
b/arch/arm/boot/dts/meson8b.dtsi
index ee352bf687ffefc97a42fbcf40f982789402e6fe..8bad5571af461e86cabc9fe708db6865d0a95774 100644
(file)
--- a/
arch/arm/boot/dts/meson8b.dtsi
+++ b/
arch/arm/boot/dts/meson8b.dtsi
@@
-105,6
+105,12
@@
#interrupt-cells = <3>;
};
+ wdt: watchdog@c1109900 {
+ compatible = "amlogic,meson8b-wdt";
+ reg = <0xc1109900 0x8>;
+ interrupts = <0 0 1>;
+ };
+
timer@c1109940 {
compatible = "amlogic,meson6-timer";
reg = <0xc1109940 0x18>;