TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gpiomux: asustek: Configure VOL_UP/VOL_DOWN with GPIO for flo/deb

Browse Source 
Change-Id: I043f466a0be972f553e20227a21f7fda829b7007
Signed-off-by: paris_yeh <paris_yeh@asus.com>
Reviewed-on: http://mcrd1-5.corpnet.asus/code-review/master/68013
Reviewed-by: Edward Lu <Edward_Lu@asus.com>
This commit is contained in:
paris_yeh
2013-01-30 17:15:23 +08:00
committed by Iliyan Malchev
parent 2303c0d2b0
commit a461c7b566
1 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
arch/arm/mach-msm/asustek/flo/board-flo-gpiomux.c
View File

@@ -659,24 +659,12 @@ static struct msm_gpiomux_config apq8064_gsbi_configs[] __initdata = {
[GPIOMUX_SUSPENDED] = &gpio_spi_config,
},
},
{
.gpio = 53, /* Funny CS0 */
.settings = {
[GPIOMUX_SUSPENDED] = &gpio_spi_config,
},
},
{
.gpio = 31, /* GSBI5 QUP SPI_CS2_N */
.settings = {
[GPIOMUX_SUSPENDED] = &gpio_spi_cs2_config,
},
},
{
.gpio = 54, /* GSBI5 QUP SPI_CLK */
.settings = {
[GPIOMUX_SUSPENDED] = &gpio_spi_config,
},
},
#endif
{
.gpio = 30, /* FP CS */
@@ -690,12 +678,6 @@ static struct msm_gpiomux_config apq8064_gsbi_configs[] __initdata = {
[GPIOMUX_SUSPENDED] = &gpio_epm_spi_cs_config,
},
},
{
.gpio = 53, /* NOR CS */
.settings = {
[GPIOMUX_SUSPENDED] = &gpio_spi_cs_config,
},
},
{
.gpio = 82, /* GSBI7 UART2 TX */
.settings = {
@@ -1271,6 +1253,36 @@ static struct msm_gpiomux_config apq8064_sdc3_configs[] __initdata = {
},
};
#ifdef CONFIG_MACH_ASUSTEK
static struct gpiomux_setting gpio_keys_active_cfg = {
.func = GPIOMUX_FUNC_GPIO,
.drv = GPIOMUX_DRV_2MA,
.pull = GPIOMUX_PULL_UP,
};
static struct gpiomux_setting gpio_keys_suspended_cfg = {
.func = GPIOMUX_FUNC_GPIO,
.drv = GPIOMUX_DRV_2MA,
.pull = GPIOMUX_PULL_UP,
};
static struct msm_gpiomux_config asustek_gpio_keys_configs[] __initdata = {
{ .gpio = 53,
.settings = {
[GPIOMUX_ACTIVE] = &gpio_keys_active_cfg,
[GPIOMUX_SUSPENDED] = &gpio_keys_suspended_cfg,
},
},
{
.gpio = 54,
.settings = {
[GPIOMUX_ACTIVE] = &gpio_keys_active_cfg,
[GPIOMUX_SUSPENDED] = &gpio_keys_suspended_cfg,
},
},
};
#endif
static struct gpiomux_setting display_ID_gpio_config = {
.func = GPIOMUX_FUNC_GPIO,
.drv = GPIOMUX_DRV_2MA,
@@ -1391,6 +1403,13 @@ void __init apq8064_init_gpiomux(void)
ARRAY_SIZE(apq8064_gsbi_configs));
}
#ifdef CONFIG_MACH_ASUSTEK
if (machine_is_apq8064_flo() || machine_is_apq8064_deb()) {
msm_gpiomux_install(asustek_gpio_keys_configs,
ARRAY_SIZE(asustek_gpio_keys_configs));
}
#endif
msm_gpiomux_install(apq8064_slimbus_config,
ARRAY_SIZE(apq8064_slimbus_config));