From 395b6924f0072b11203b5b294199ec19b5c11db2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Jan 2013 17:29:58 +0100 Subject: [PATCH] --- yaml --- r: 359943 b: refs/heads/master c: 4ca73962a15caccd310093266783be89a81d571f h: refs/heads/master i: 359941: 56d5d0b9e35acf6f378e270c2b8ef75033aead5c 359939: e2d697f16b121ef16923328bf447309fdac962e9 359935: 6ffb6bdf5f0fab6e6d187a005954665f2fa590cc v: v3 --- [refs] | 2 +- .../arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 47f761d97854..5a22df32f3ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 102c9543ff368709980c6d68b7a75f840edda6b5 +refs/heads/master: 4ca73962a15caccd310093266783be89a81d571f diff --git a/trunk/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/trunk/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts index b42652fd3d8c..ec368643e478 100644 --- a/trunk/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/trunk/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts @@ -66,6 +66,18 @@ }; }; + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + + button@1 { + label = "Init Button"; + linux,code = <116>; + gpios = <&gpio1 28 0>; + }; + }; + mdio { phy0: ethernet-phy@0 { reg = <0>;