From c16d1fdb4ee4142351bdbd57222cdd5d5e25df94 Mon Sep 17 00:00:00 2001 From: Edward Cragg Date: Fri, 27 Nov 2015 09:45:28 +0100 Subject: ARM: meson: Add status LED for Odroid-C1 Add the blue status LED to the Hardkernel Odroid C1 board DTS. Signed-off-by: Signed-off-by: Carlo Caione --- arch/arm/boot/dts/meson8b-odroidc1.dts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/meson8b-odroidc1.dts index a8e2911b2cbe..e50f1a1fdbc7 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 / { 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 { -- cgit v1.2.3 From ea22446a9d170bf7f32bd7f99036e17df918f054 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Sun, 8 Nov 2015 13:18:56 +0100 Subject: Documentation: watchdog: Add new bindings for meson8b We make the documentation not meson6 specific anymore and add the new binding for meson8b SoC. Signed-off-by: Carlo Caione --- Documentation/devicetree/bindings/watchdog/meson-wdt.txt | 13 +++++++++++++ Documentation/devicetree/bindings/watchdog/meson6-wdt.txt | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/meson-wdt.txt delete mode 100644 Documentation/devicetree/bindings/watchdog/meson6-wdt.txt diff --git a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt new file mode 100644 index 000000000000..ae70185d96e6 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt @@ -0,0 +1,13 @@ +Meson SoCs Watchdog timer + +Required properties: + +- compatible : should be "amlogic,meson6-wdt" or "amlogic,meson8b-wdt" +- reg : Specifies base physical address and size of the registers. + +Example: + +wdt: watchdog@c1109900 { + compatible = "amlogic,meson6-wdt"; + reg = <0xc1109900 0x8>; +}; diff --git a/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt deleted file mode 100644 index 9200fc2d508c..000000000000 --- a/Documentation/devicetree/bindings/watchdog/meson6-wdt.txt +++ /dev/null @@ -1,13 +0,0 @@ -Meson SoCs Watchdog timer - -Required properties: - -- compatible : should be "amlogic,meson6-wdt" -- reg : Specifies base physical address and size of the registers. - -Example: - -wdt: watchdog@c1109900 { - compatible = "amlogic,meson6-wdt"; - reg = <0xc1109900 0x8>; -}; -- cgit v1.2.3 From e9c478a93c113e0ee47f40b80962abe2e2feccc0 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Sun, 8 Nov 2015 13:18:57 +0100 Subject: ARM: dts: meson8b: Add watchdog node With this patch we add the watchdog node in the meson8b DTS file. Signed-off-by: Carlo Caione --- arch/arm/boot/dts/meson8b.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index ee352bf687ff..8bad5571af46 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>; -- cgit v1.2.3