Skip to content

Commit

Permalink
Merge tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux…
Browse files Browse the repository at this point in the history
…-meson into next/dt

Merge "Meson6 WDT support" from Carlo Caione:

This patch adds the support for the Meson6 watchdog in the DTSI

* tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux-meson:
  ARM: DTS: meson: update DTSI to add watchdog node

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Oct 8, 2014
2 parents 4394a00 + d4ac2cf commit ee48874
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/meson.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@
#size-cells = <1>;
ranges;

wdt: watchdog@c1109900 {
compatible = "amlogic,meson6-wdt";
reg = <0xc1109900 0x8>;
};

uart_AO: serial@c81004c0 {
compatible = "amlogic,meson-uart";
reg = <0xc81004c0 0x14>;
Expand Down

0 comments on commit ee48874

Please sign in to comment.