From 311c163f71762993a395fa2a80a6bba5e95daed4 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Tue, 12 Apr 2011 11:29:01 -0600 Subject: [PATCH] --- yaml --- r: 248295 b: refs/heads/master c: 61a6d0764be43e014d265128c2af1b41e0fc96b0 h: refs/heads/master i: 248293: 650ee61293d2ddd4f191e5362fc7741f74233587 248291: f0567b2ec38cd5538c372e0f15f43bf7c042796e 248287: f42bb4e9c5e3257156ea3029bcf2a51b61296aa4 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/board-harmony.c | 1 + trunk/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a253140e806c..4982ea632730 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b33af252fbbf3beb694448da3ba6687022fd602 +refs/heads/master: 61a6d0764be43e014d265128c2af1b41e0fc96b0 diff --git a/trunk/arch/arm/mach-tegra/board-harmony.c b/trunk/arch/arm/mach-tegra/board-harmony.c index 987c5e46d581..30e18bc60647 100644 --- a/trunk/arch/arm/mach-tegra/board-harmony.c +++ b/trunk/arch/arm/mach-tegra/board-harmony.c @@ -70,6 +70,7 @@ static struct platform_device debug_uart = { static struct tegra_wm8903_platform_data harmony_audio_pdata = { .gpio_spkr_en = TEGRA_GPIO_SPKR_EN, .gpio_hp_det = TEGRA_GPIO_HP_DET, + .gpio_hp_mute = -1, .gpio_int_mic_en = TEGRA_GPIO_INT_MIC_EN, .gpio_ext_mic_en = TEGRA_GPIO_EXT_MIC_EN, }; diff --git a/trunk/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h b/trunk/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h index c34bd5eb204e..9d293344a7ff 100644 --- a/trunk/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h +++ b/trunk/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h @@ -17,6 +17,7 @@ struct tegra_wm8903_platform_data { int gpio_spkr_en; int gpio_hp_det; + int gpio_hp_mute; int gpio_int_mic_en; int gpio_ext_mic_en; };