diff options
Diffstat (limited to 'arch/arm/mach-tegra')
| -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 b753b6584623..70ca8be517a6 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -378,6 +378,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) @@ -435,6 +436,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; }; |