From 31d0243fdd4ffc0559db509973f6fd8c78d0553a Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Sat, 4 Feb 2012 12:42:35 +0800
Subject: [PATCH] --- yaml --- r: 296207 b: refs/heads/master c:
 8a087b0c15d976a71cafbb12aeac77e304c84db5 h: refs/heads/master i:   296205:
 381ea55b7bc3c5db229167ee1dc4f6d6626b5950   296203:
 7db14cc08ae9a142800fd398ff9542e821a5cf93   296199:
 6ae1dbfc61bc3ac5d9f507a3fcbb781af1953a11   296191:
 1f2fc871a92d512db329872f60726f7eda70dc9e v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts | 50 ++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 05c100760a99..a47ece9a67ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2ee7acd3d0bfcdaf4a76e0a152f373d415a4e31
+refs/heads/master: 8a087b0c15d976a71cafbb12aeac77e304c84db5
diff --git a/trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts b/trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts
index ae8ed6a304dd..15e25f903cad 100644
--- a/trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -59,4 +59,54 @@
 			linux,default-trigger = "mmc0";
 		};
 	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		left_click {
+			label = "left_click";
+			gpios = <&pioB 6 1>;
+			linux,code = <272>;
+			gpio-key,wakeup;
+		};
+
+		right_click {
+			label = "right_click";
+			gpios = <&pioB 7 1>;
+			linux,code = <273>;
+			gpio-key,wakeup;
+		};
+
+		left {
+			label = "Joystick Left";
+			gpios = <&pioB 14 1>;
+			linux,code = <105>;
+		};
+
+		right {
+			label = "Joystick Right";
+			gpios = <&pioB 15 1>;
+			linux,code = <106>;
+		};
+
+		up {
+			label = "Joystick Up";
+			gpios = <&pioB 16 1>;
+			linux,code = <103>;
+		};
+
+		down {
+			label = "Joystick Down";
+			gpios = <&pioB 17 1>;
+			linux,code = <108>;
+		};
+
+		enter {
+			label = "Joystick Press";
+			gpios = <&pioB 18 1>;
+			linux,code = <28>;
+		};
+	};
 };