Merge tag 'meson-for-4.5/dts' of https://github.com/carlocaione/linux-meson into next/dt

Merge "Amlogic DT changes for 4.5" from Carlo Caione:

This pull request includes the Amlogic Meson8b DTS changes for v4.5

* tag 'meson-for-4.5/dts' of https://github.com/carlocaione/linux-meson:
  ARM: dts: meson8b: Add watchdog node
  Documentation: watchdog: Add new bindings for meson8b
  ARM: meson: Add status LED for Odroid-C1
This commit is contained in:
Arnd Bergmann 2016-01-08 11:43:57 +01:00
commit 3c81e4e60a
3 changed files with 18 additions and 1 deletions

View File

@ -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:

View File

@ -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 {

View File

@ -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>;