diff options
author | Stephen Warren <swarren@nvidia.com> | 2011-04-12 13:29:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:55:58 -0400 |
commit | 61a6d0764be43e014d265128c2af1b41e0fc96b0 (patch) | |
tree | 433f1907b49e28c422e2cf8165b85aa4bd077799 /arch | |
parent | 7b33af252fbbf3beb694448da3ba6687022fd602 (diff) |
ARM: Tegra: Add to tegra_wm8903_platform_data
Seaboard derivate Kaen has a GPIO to mute the headphone output. Add a field
to tegra_wm8903_platform_data so the board files can pass the GPIO number
for that to the ASoC machine driver.
Also, initialize this new field to a "not present" value for Harmony.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-tegra/board-harmony.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index 987c5e46d581..30e18bc60647 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c | |||
@@ -70,6 +70,7 @@ static struct platform_device debug_uart = { | |||
70 | static struct tegra_wm8903_platform_data harmony_audio_pdata = { | 70 | static struct tegra_wm8903_platform_data harmony_audio_pdata = { |
71 | .gpio_spkr_en = TEGRA_GPIO_SPKR_EN, | 71 | .gpio_spkr_en = TEGRA_GPIO_SPKR_EN, |
72 | .gpio_hp_det = TEGRA_GPIO_HP_DET, | 72 | .gpio_hp_det = TEGRA_GPIO_HP_DET, |
73 | .gpio_hp_mute = -1, | ||
73 | .gpio_int_mic_en = TEGRA_GPIO_INT_MIC_EN, | 74 | .gpio_int_mic_en = TEGRA_GPIO_INT_MIC_EN, |
74 | .gpio_ext_mic_en = TEGRA_GPIO_EXT_MIC_EN, | 75 | .gpio_ext_mic_en = TEGRA_GPIO_EXT_MIC_EN, |
75 | }; | 76 | }; |
diff --git a/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h b/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h index c34bd5eb204e..9d293344a7ff 100644 --- a/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h +++ b/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h | |||
@@ -17,6 +17,7 @@ | |||
17 | struct tegra_wm8903_platform_data { | 17 | struct tegra_wm8903_platform_data { |
18 | int gpio_spkr_en; | 18 | int gpio_spkr_en; |
19 | int gpio_hp_det; | 19 | int gpio_hp_det; |
20 | int gpio_hp_mute; | ||
20 | int gpio_int_mic_en; | 21 | int gpio_int_mic_en; |
21 | int gpio_ext_mic_en; | 22 | int gpio_ext_mic_en; |
22 | }; | 23 | }; |