diff options
author | Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> | 2012-08-05 16:39:12 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-09-22 10:38:52 -0400 |
commit | 17ba0226b9e88cf6ee506986befadfab70ebc6c8 (patch) | |
tree | 9c41935160a4a9e8a5849198ab50ea9f32b8e4ad /arch/arm/mach-kirkwood/board-iconnect.c | |
parent | 55d512e245bc7699a8800e23df1a24195dd08217 (diff) |
ARM: Kirkwood: Describe iconnect keys in DT.
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 <arnaud.patard@rtp-net.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-kirkwood/board-iconnect.c')
-rw-r--r-- | arch/arm/mach-kirkwood/board-iconnect.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c index d7a9198ed300..51728db92dc5 100644 --- a/arch/arm/mach-kirkwood/board-iconnect.c +++ b/arch/arm/mach-kirkwood/board-iconnect.c | |||
@@ -19,8 +19,6 @@ | |||
19 | #include <linux/mtd/partitions.h> | 19 | #include <linux/mtd/partitions.h> |
20 | #include <linux/mv643xx_eth.h> | 20 | #include <linux/mv643xx_eth.h> |
21 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
22 | #include <linux/input.h> | ||
23 | #include <linux/gpio_keys.h> | ||
24 | #include <asm/mach/arch.h> | 22 | #include <asm/mach/arch.h> |
25 | #include <mach/kirkwood.h> | 23 | #include <mach/kirkwood.h> |
26 | #include "common.h" | 24 | #include "common.h" |
@@ -52,40 +50,6 @@ static struct mtd_partition iconnect_nand_parts[] = { | |||
52 | }, | 50 | }, |
53 | }; | 51 | }; |
54 | 52 | ||
55 | /* yikes... theses are the original input buttons */ | ||
56 | /* but I'm not convinced by the sw event choices */ | ||
57 | static struct gpio_keys_button iconnect_buttons[] = { | ||
58 | { | ||
59 | .type = EV_SW, | ||
60 | .code = SW_LID, | ||
61 | .gpio = 12, | ||
62 | .desc = "Reset Button", | ||
63 | .active_low = 1, | ||
64 | .debounce_interval = 100, | ||
65 | }, { | ||
66 | .type = EV_SW, | ||
67 | .code = SW_TABLET_MODE, | ||
68 | .gpio = 35, | ||
69 | .desc = "OTB Button", | ||
70 | .active_low = 1, | ||
71 | .debounce_interval = 100, | ||
72 | }, | ||
73 | }; | ||
74 | |||
75 | static struct gpio_keys_platform_data iconnect_button_data = { | ||
76 | .buttons = iconnect_buttons, | ||
77 | .nbuttons = ARRAY_SIZE(iconnect_buttons), | ||
78 | }; | ||
79 | |||
80 | static struct platform_device iconnect_button_device = { | ||
81 | .name = "gpio-keys", | ||
82 | .id = -1, | ||
83 | .num_resources = 0, | ||
84 | .dev = { | ||
85 | .platform_data = &iconnect_button_data, | ||
86 | }, | ||
87 | }; | ||
88 | |||
89 | void __init iconnect_init(void) | 53 | void __init iconnect_init(void) |
90 | { | 54 | { |
91 | kirkwood_mpp_conf(iconnect_mpp_config); | 55 | kirkwood_mpp_conf(iconnect_mpp_config); |
@@ -93,8 +57,6 @@ void __init iconnect_init(void) | |||
93 | 57 | ||
94 | kirkwood_ehci_init(); | 58 | kirkwood_ehci_init(); |
95 | kirkwood_ge00_init(&iconnect_ge00_data); | 59 | kirkwood_ge00_init(&iconnect_ge00_data); |
96 | |||
97 | platform_device_register(&iconnect_button_device); | ||
98 | } | 60 | } |
99 | 61 | ||
100 | static int __init iconnect_pci_init(void) | 62 | static int __init iconnect_pci_init(void) |