Commit ee48874d authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux-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: default avatarArnd Bergmann <arnd@arndb.de>
parents 4394a001 d4ac2cfe
......@@ -70,6 +70,11 @@ soc {
#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>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment