diff options
| author | Nikesh Oswal <noswal@nvidia.com> | 2011-07-13 10:01:59 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-07-14 20:27:37 -0700 |
| commit | 8d0867f7c616f5e9611e4ff8c230fabeaaee16a3 (patch) | |
| tree | 24c9cfd02faca7d04303f84c09e08d939665adc8 | |
| parent | 0290554f47038da2331ad233f0e35624517085cf (diff) | |
arm: tegra: enterprise: headset detection
gpio/irq changes for headset detction
Bug 836629
Change-Id: I4ba472f4796568d530e1618c9ede687e4e9bfa3b
Reviewed-on: http://git-master/r/40773
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise-pinmux.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-pinmux.c b/arch/arm/mach-tegra/board-enterprise-pinmux.c index 5b61d9dbdf98..49d66afba39a 100644 --- a/arch/arm/mach-tegra/board-enterprise-pinmux.c +++ b/arch/arm/mach-tegra/board-enterprise-pinmux.c @@ -326,6 +326,7 @@ static __initdata struct tegra_pingroup_config enterprise_pinmux[] = { DEFAULT_PINMUX(SPI1_SCK, SPI1, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(SPI1_CS0_N, SPI1, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(SPI1_MISO, SPI1, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(SPI2_CS2_N, SPI2, PULL_UP, NORMAL, INPUT), DEFAULT_PINMUX(PEX_L0_PRSNT_N, PCIE, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(PEX_L0_RST_N, PCIE, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(PEX_L0_CLKREQ_N, PCIE, NORMAL, NORMAL, INPUT), diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c index 7e5125851792..33277c313594 100644 --- a/arch/arm/mach-tegra/board-enterprise.c +++ b/arch/arm/mach-tegra/board-enterprise.c @@ -327,6 +327,7 @@ static struct i2c_board_info __initdata enterprise_i2c_bus1_board_info[] = { { I2C_BOARD_INFO("max98088", 0x10), .platform_data = &max98088_pdata, + .irq = TEGRA_GPIO_TO_IRQ(TEGRA_GPIO_PW3), }, }; @@ -416,6 +417,10 @@ static void enterprise_audio_init(void) platform_device_register(&tegra_hda_device); #endif + gpio_request(TEGRA_GPIO_PW3, "audio_int"); + gpio_direction_input(TEGRA_GPIO_PW3); + tegra_gpio_enable(TEGRA_GPIO_PW3); + tegra_i2s_device0.dev.platform_data = &tegra_i2s_pdata[0]; platform_device_register(&tegra_i2s_device0); |