diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-01-08 11:43:57 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-01-08 11:43:57 +0100 |
| commit | 3c81e4e60a627afb7ac7b8dc855a88b02d9f0cca (patch) | |
| tree | a71e3174e3e87a5547d286381f55b22ec426a004 | |
| parent | 03b9ee45bcebd1ea2811e7c90d13b6b69b0cce9b (diff) | |
| parent | e9c478a93c113e0ee47f40b80962abe2e2feccc0 (diff) | |
| download | op-kernel-dev-3c81e4e60a627afb7ac7b8dc855a88b02d9f0cca.zip op-kernel-dev-3c81e4e60a627afb7ac7b8dc855a88b02d9f0cca.tar.gz | |
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
| -rw-r--r-- | Documentation/devicetree/bindings/watchdog/meson-wdt.txt (renamed from Documentation/devicetree/bindings/watchdog/meson6-wdt.txt) | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/meson8b-odroidc1.dts | 11 | ||||
| -rw-r--r-- | arch/arm/boot/dts/meson8b.dtsi | 6 |
3 files changed, 18 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt index 9200fc2..ae70185 100644 --- a/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt @@ -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: diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/meson8b-odroidc1.dts index a8e2911..e50f1a1 100644 --- a/arch/arm/boot/dts/meson8b-odroidc1.dts +++ b/arch/arm/boot/dts/meson8b-odroidc1.dts @@ -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 { diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index ee352bf..8bad557 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -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>; |
