Merge tag 'meson-for-4.5/dts' of https://github.com/carlocaione/linux-meson into next/dt (3c81e4e6) · Commits · 戴 / test

Documentation/devicetree/bindings/watchdog/meson6-wdt.txt→Documentation/devicetree/bindings/watchdog/meson-wdt.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ Meson SoCs Watchdog timer

		Required properties:

		- compatible : should be "amlogic,meson6-wdt"
		- compatible : should be "amlogic,meson6-wdt" or "amlogic,meson8b-wdt"
		- reg : Specifies base physical address and size of the registers.

		Example:

+11 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@

		/dts-v1/;
		#include "meson8b.dtsi"
		#include <dt-bindings/gpio/gpio.h>

		/ {
		model = "Hardkernel ODROID-C1";
		@@ -58,6 +59,16 @@
		memory {
		reg = <0x40000000 0x40000000>;
		};

		leds {
		compatible = "gpio-leds";
		blue {
		label = "c1:blue:alive";
		gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>;
		linux,default-trigger = "heartbeat";
		default-state = "off";
		};
		};
		};

		&uart_AO {

+6 −0

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