Commit ee48874d authored Oct 08, 2014 by 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: Arnd Bergmann <arnd@arndb.de>

parents 4394a001 d4ac2cfe

arch/arm/boot/dts/meson.dtsi

+5 −0

Original line number	Diff line number	Diff line
		@@ -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>;