aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c')
-rw-r--r--arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
index 6269053505f7..176e61bf44b6 100644
--- a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
@@ -22,7 +22,6 @@
22#include <linux/gpio.h> 22#include <linux/gpio.h>
23#include <linux/leds.h> 23#include <linux/leds.h>
24#include <linux/platform_device.h> 24#include <linux/platform_device.h>
25#include <linux/gpio_keys.h>
26#include <linux/input.h> 25#include <linux/input.h>
27#include <video/platform_lcd.h> 26#include <video/platform_lcd.h>
28 27
@@ -208,23 +207,14 @@ static struct gpio_keys_button eukrea_mbimxsd_gpio_buttons[] = {
208 }, 207 },
209}; 208};
210 209
211static struct gpio_keys_platform_data eukrea_mbimxsd_button_data = { 210static const struct gpio_keys_platform_data
211 eukrea_mbimxsd_button_data __initconst = {
212 .buttons = eukrea_mbimxsd_gpio_buttons, 212 .buttons = eukrea_mbimxsd_gpio_buttons,
213 .nbuttons = ARRAY_SIZE(eukrea_mbimxsd_gpio_buttons), 213 .nbuttons = ARRAY_SIZE(eukrea_mbimxsd_gpio_buttons),
214}; 214};
215 215
216static struct platform_device eukrea_mbimxsd_button_device = {
217 .name = "gpio-keys",
218 .id = -1,
219 .num_resources = 0,
220 .dev = {
221 .platform_data = &eukrea_mbimxsd_button_data,
222 }
223};
224
225static struct platform_device *platform_devices[] __initdata = { 216static struct platform_device *platform_devices[] __initdata = {
226 &eukrea_mbimxsd_leds_gpio, 217 &eukrea_mbimxsd_leds_gpio,
227 &eukrea_mbimxsd_button_device,
228 &eukrea_mbimxsd_lcd_powerdev, 218 &eukrea_mbimxsd_lcd_powerdev,
229}; 219};
230 220
@@ -299,4 +289,5 @@ void __init eukrea_mbimxsd25_baseboard_init(void)
299 ARRAY_SIZE(eukrea_mbimxsd_i2c_devices)); 289 ARRAY_SIZE(eukrea_mbimxsd_i2c_devices));
300 290
301 platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); 291 platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
292 imx_add_gpio_keys(&eukrea_mbimxsd_button_data);
302} 293}