[1/2] ARM: Kirkwood: Describe iconnect keys in DT.

Commit Message

Arnaud Patard (Rtp) Aug. 5, 2012, 8:39 p.m. UTC

Define the 2 keys found on iconnect in DT. It's also changing the keycodes/
switches to use better ones.

Signed-off-by: Arnaud Patard <[e-mail]>

Comments

Jason Cooper Aug. 14, 2012, 7:46 p.m. UTC | #1

On Sun, Aug 05, 2012 at 10:39:12PM +0200, Arnaud Patard wrote:
> Define the 2 keys found on iconnect in DT. It's also changing the keycodes/
> switches to use better ones.
> 
> Signed-off-by: Arnaud Patard <[e-mail]>

applied to:

git://git.infradead.org/users/jcooper/linux.git boards-for-v3.7

thx,

Jason.

Patch

Index: alunn/arch/arm/boot/dts/kirkwood-iconnect.dts
===================================================================
--- alunn.orig/arch/arm/boot/dts/kirkwood-iconnect.dts	2012-07-25 23:46:51.039862074 +0200
+++ alunn/arch/arm/boot/dts/kirkwood-iconnect.dts	2012-07-25 23:58:06.487832357 +0200
@@ -69,4 +69,22 @@ 
 			gpios = <&gpio1 16 0>;
 		};
 	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		button@1 {
+			label = "OTB Button";
+			linux,code = <133>;
+			gpios = <&gpio1 3 1>;
+			debounce-interval = <100>;
+		};
+		button@2 {
+			label = "Reset";
+			linux,code = <0x198>;
+			gpios = <&gpio0 12 1>;
+			debounce-interval = <100>;
+		};
+	};
 };
Index: alunn/arch/arm/mach-kirkwood/board-iconnect.c
===================================================================
--- alunn.orig/arch/arm/mach-kirkwood/board-iconnect.c	2012-07-25 23:46:38.911862608 +0200
+++ alunn/arch/arm/mach-kirkwood/board-iconnect.c	2012-07-25 23:58:06.487832357 +0200
@@ -19,8 +19,6 @@ 
 #include <linux/mtd/partitions.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/gpio.h>
-#include <linux/input.h>
-#include <linux/gpio_keys.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
 #include "common.h"
@@ -52,40 +50,6 @@  static struct mtd_partition iconnect_nan
 	},
 };
 
-/* yikes... theses are the original input buttons */
-/* but I'm not convinced by the sw event choices  */
-static struct gpio_keys_button iconnect_buttons[] = {
-	{
-		.type		= EV_SW,
-		.code		= SW_LID,
-		.gpio		= 12,
-		.desc		= "Reset Button",
-		.active_low	= 1,
-		.debounce_interval = 100,
-	}, {
-		.type		= EV_SW,
-		.code		= SW_TABLET_MODE,
-		.gpio		= 35,
-		.desc		= "OTB Button",
-		.active_low	= 1,
-		.debounce_interval = 100,
-	},
-};
-
-static struct gpio_keys_platform_data iconnect_button_data = {
-	.buttons	= iconnect_buttons,
-	.nbuttons	= ARRAY_SIZE(iconnect_buttons),
-};
-
-static struct platform_device iconnect_button_device = {
-	.name		= "gpio-keys",
-	.id		= -1,
-	.num_resources	= 0,
-	.dev        = {
-		.platform_data  = &iconnect_button_data,
-	},
-};
-
 void __init iconnect_init(void)
 {
 	kirkwood_mpp_conf(iconnect_mpp_config);
@@ -93,8 +57,6 @@  void __init iconnect_init(void)
 
 	kirkwood_ehci_init();
 	kirkwood_ge00_init(&iconnect_ge00_data);
-
-	platform_device_register(&iconnect_button_device);
 }
 
 static int __init iconnect_pci_init(void)