DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add gpio-keys setup to board

Browse Source
This commit is contained in:
James Sullins
2012-02-01 12:45:31 -06:00
parent ac27b4a170
commit e1092d9346
1 changed files with 99 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
arch/arm/mach-msm/board-msm8x60.c
View File

@@ -85,6 +85,7 @@
#include <mach/rpm-regulator.h> #include <mach/rpm-regulator.h>
#include <mach/restart.h> #include <mach/restart.h>
#include <mach/board-msm8660.h> #include <mach/board-msm8660.h>
#include <linux/gpio_keys.h>
#include "devices.h" #include "devices.h"
#include "devices-msm8x60.h" #include "devices-msm8x60.h"
@@ -3730,6 +3731,87 @@ static struct msm_serial_hs_platform_data msm_uart_dm1_pdata = {
}; };
#endif #endif
#ifdef CONFIG_KEYBOARD_GPIO
static struct gpio_keys_button topaz_wifi_gpio_keys_buttons[] = {
{
.code = KEY_VOLUMEUP,
.gpio = 103,
.desc = "VolUp",
.active_low = 1,
.type = EV_KEY,
.wakeup = 0
},
{
.code = KEY_VOLUMEDOWN,
.gpio = 104,
.desc = "VolDn",
.active_low = 1,
.type = EV_KEY,
.wakeup = 0
},
{
.code = KEY_HOME,
.gpio = 40,
.desc = "Home",
.active_low = 1,
.type = EV_KEY,
.wakeup = 1
},
};
#if 0 /* TODO - enable later */
static struct gpio_keys_button topaz_3g_gpio_keys_buttons[] = {
{
.code = KEY_VOLUMEUP,
.gpio = PM8058_GPIO_PM_TO_SYS(5),
.desc = "VolUp",
.active_low = 1,
.type = EV_KEY,
.wakeup = 0
},
{
.code = KEY_VOLUMEDOWN,
.gpio = PM8058_GPIO_PM_TO_SYS(6),
.desc = "VolDn",
.active_low = 1,
.type = EV_KEY,
.wakeup = 0
},
{
.code = KEY_HOME,
.gpio = 40,
.desc = "Home",
.active_low = 1,
.type = EV_KEY,
.wakeup = 0
},
};
static struct gpio_keys_platform_data topaz_3g_gpio_keys_data = {
.buttons = topaz_3g_gpio_keys_buttons,
.nbuttons = ARRAY_SIZE(topaz_3g_gpio_keys_buttons),
.rep = 0,
};
#endif
static struct gpio_keys_platform_data topaz_wifi_gpio_keys_data = {
.buttons = topaz_wifi_gpio_keys_buttons,
.nbuttons = ARRAY_SIZE(topaz_wifi_gpio_keys_buttons),
.rep = 0,
};
static struct platform_device msm_gpio_keys = {
.name = "gpio-keys",
.id = -1,
/*
//This guy will be valued when msm8x60_init.
.dev = {
.platform_data = &gpio_keys_data,
},
*/
};
#endif
#if defined(CONFIG_GPIO_SX150X) || defined(CONFIG_GPIO_SX150X_MODULE) #if defined(CONFIG_GPIO_SX150X) || defined(CONFIG_GPIO_SX150X_MODULE)
@@ -5237,6 +5319,9 @@ static struct platform_device *surf_devices[] __initdata = {
#ifdef CONFIG_BATTERY_MSM #ifdef CONFIG_BATTERY_MSM
&msm_batt_device, &msm_batt_device,
#endif #endif
#ifdef CONFIG_KEYBOARD_GPIO
&msm_gpio_keys,
#endif
#ifdef CONFIG_ANDROID_PMEM #ifdef CONFIG_ANDROID_PMEM
#ifndef CONFIG_MSM_MULTIMEDIA_USE_ION #ifndef CONFIG_MSM_MULTIMEDIA_USE_ION
&android_pmem_device, &android_pmem_device,
@@ -10595,6 +10680,20 @@ static void __init tenderloin_setup_pin_table(void)
} }
} }
#ifdef CONFIG_KEYBOARD_GPIO
if (machine_is_tenderloin()) {
msm_gpio_keys.dev.platform_data = &topaz_wifi_gpio_keys_data;
}
#if 0 /* TODO */
else if (board_is_opal_wifi()||board_is_opal_3g()||board_is_topaz_3g()) {
msm_gpio_keys.dev.platform_data = &topaz_3g_gpio_keys_data;
}
#endif
else
msm_gpio_keys.dev.platform_data = &topaz_wifi_gpio_keys_data;
#endif
#if 0 // TODO #if 0 // TODO
// touchpanel // touchpanel
xMT1386_board_info[0].irq = MSM_GPIO_TO_INT(pin_table[MXT1386_TS_PEN_IRQ]); xMT1386_board_info[0].irq = MSM_GPIO_TO_INT(pin_table[MXT1386_TS_PEN_IRQ]);