diff options
| author | Nikesh Oswal <noswal@nvidia.com> | 2011-10-10 17:36:28 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:17 -0800 |
| commit | 5e2b6915b6eaf03d8c6a3316182df36a4d22fb19 (patch) | |
| tree | 0bbbe96f2742cca109f443a124de9d0bbe891b9e /arch/arm | |
| parent | fe9ce1f6ad0f847221e09b8baafbf66e2483b883 (diff) | |
arm: tegra: whistler: add headphone debouncetime and irq
add entries for headphone detection irq and debouncetime in
whistler specific board files
Bug: 862023
Change-Id: Ia72ec10f51a1bde0f81eb488b36a8b1439cedf1d
Signed-off-by: Nikesh Oswal <noswal@nvidia.com>
Reviewed-on: http://git-master/r/57034
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: Re6e96dcd5467b14054784fd6c59bd2a8c64781c0
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/tegra_wm8753_pdata.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c index 64e7dc29fca2..1e79ae50f0a8 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -260,6 +260,7 @@ static struct tegra_i2c_platform_data whistler_dvc_platform_data = { static struct i2c_board_info __initdata wm8753_board_info = { I2C_BOARD_INFO("wm8753", 0x1a), + .irq = TEGRA_GPIO_TO_IRQ(TEGRA_GPIO_HP_DET), }; static void whistler_i2c_init(void) @@ -317,6 +318,7 @@ static struct tegra_wm8753_platform_data whistler_audio_pdata = { .gpio_hp_mute = -1, .gpio_int_mic_en = -1, .gpio_ext_mic_en = -1, + .debounce_time_hp = 200, }; static struct platform_device whistler_audio_device = { diff --git a/arch/arm/mach-tegra/board-whistler.h b/arch/arm/mach-tegra/board-whistler.h index 884f7c416a02..69d4dd21a558 100644 --- a/arch/arm/mach-tegra/board-whistler.h +++ b/arch/arm/mach-tegra/board-whistler.h @@ -33,6 +33,6 @@ int whistler_emc_init(void); /* Audio-related GPIOs */ #define WHISTLER_GPIO_WM8753(_x_) (MAX8907C_INT_END + 1 + (_x_)) #define TEGRA_GPIO_SPKR_EN WHISTLER_GPIO_WM8753(2) -#define TEGRA_GPIO_HP_DET TEGRA_GPIO_PW2 +#define TEGRA_GPIO_HP_DET TEGRA_GPIO_PW3 #endif diff --git a/arch/arm/mach-tegra/include/mach/tegra_wm8753_pdata.h b/arch/arm/mach-tegra/include/mach/tegra_wm8753_pdata.h index 17190c653baf..944e410b4aec 100644 --- a/arch/arm/mach-tegra/include/mach/tegra_wm8753_pdata.h +++ b/arch/arm/mach-tegra/include/mach/tegra_wm8753_pdata.h @@ -20,4 +20,5 @@ struct tegra_wm8753_platform_data { int gpio_hp_mute; int gpio_int_mic_en; int gpio_ext_mic_en; + unsigned int debounce_time_hp; }; |