summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Nelson <eric.nelson@boundarydevices.com>2012-12-14 10:55:46 -0700
committerEric Nelson <eric.nelson@boundarydevices.com>2013-02-12 10:46:56 -0700
commitd15e75a6f832200e6cebbc83966a17e2d33db7b8 (patch)
treeaffb6ccd183a14467f1f6e735f94a121d6069a1e
parenta6f528ea9ae6333e719a3fb8f902258736b15332 (diff)
mx6qsabrelite: export buttons as GPIO if no KEYBOARD_GPIO
-rw-r--r--arch/arm/mach-mx6/board-mx6q_sabrelite.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c
index bc48251d8bd7..b586426afaca 100644
--- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c
+++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c
@@ -779,7 +779,6 @@ static const struct pm_platform_data mx6_sabrelite_pm_data __initconst = {
.suspend_exit = sabrelite_suspend_exit,
};
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
#define GPIO_BUTTON(gpio_num, ev_code, act_low, descr, wake) \
{ \
.gpio = gpio_num, \
@@ -799,6 +798,7 @@ static struct gpio_keys_button sabrelite_buttons[] = {
GPIO_BUTTON(MX6_SABRELITE_VOL_DOWN_KEY, KEY_VOLUMEDOWN, 1, "volume-down", 0),
};
+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
static struct gpio_keys_platform_data sabrelite_button_data = {
.buttons = sabrelite_buttons,
.nbuttons = ARRAY_SIZE(sabrelite_buttons),
@@ -818,7 +818,15 @@ static void __init sabrelite_add_device_buttons(void)
platform_device_register(&sabrelite_button_device);
}
#else
-static void __init sabrelite_add_device_buttons(void) {}
+static void __init sabrelite_add_device_buttons(void)
+{
+ int i;
+ for (i=0; i < ARRAY_SIZE(sabrelite_buttons);i++) {
+ int gpio = sabrelite_buttons[i].gpio;
+ pr_debug("%s: exporting gpio %d\n", __func__, gpio);
+ gpio_export(gpio,1);
+ }
+}
#endif
#ifdef CONFIG_WL12XX_PLATFORM_DATA