diff options
| author | Vinod G <vinodg@nvidia.com> | 2011-02-23 10:42:02 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:52:16 -0700 |
| commit | 8042bc02a424d9e9124b58b759a2f77f03558180 (patch) | |
| tree | fac5185104adb686088065a8a2a1077c9b10ab45 /sound | |
| parent | 7b1635885fb94f0c9c1087786b5b414a0fef66a4 (diff) | |
arm: tegra: Support for headset/headphone jack detection
Added the support to do jack detection through gpio.
Original-Change-Id: I324234e5c87a7d3f660a1e33f5d4ddbb287f62e1
Reviewed-on: http://git-master/r/20605
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Tested-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Change-Id: Ie579d2dfad980fe417e1a03564228ea4ae7d5e80
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_soc.h | 1 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_soc_controls.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/tegra/tegra_soc.h b/sound/soc/tegra/tegra_soc.h index be122d2afd6c..7554ecec90d7 100644 --- a/sound/soc/tegra/tegra_soc.h +++ b/sound/soc/tegra/tegra_soc.h @@ -138,6 +138,7 @@ int tegra_controls_init(struct snd_soc_codec *codec); int tegra_jack_init(struct snd_soc_codec *codec); void tegra_jack_exit(void); void tegra_jack_resume(void); + void tegra_switch_set_state(int state); void setup_i2s_dma_request(struct snd_pcm_substream *substream, diff --git a/sound/soc/tegra/tegra_soc_controls.c b/sound/soc/tegra/tegra_soc_controls.c index 138fac279f47..dbb4bdf67aea 100644 --- a/sound/soc/tegra/tegra_soc_controls.c +++ b/sound/soc/tegra/tegra_soc_controls.c @@ -79,6 +79,7 @@ static void tegra_audio_route(struct tegra_audio_data* audio_data, if ((is_call_mode_new != audio_data->is_call_mode) || (is_bt_sco_mode != was_bt_sco_mode)) { +#if defined(CONFIG_ARCH_TEGRA_2x_SOC) if (is_call_mode_new && is_bt_sco_mode) { tegra_das_set_connection (tegra_das_port_con_id_voicecall_with_bt); @@ -95,6 +96,7 @@ static void tegra_audio_route(struct tegra_audio_data* audio_data, tegra_das_set_connection (tegra_das_port_con_id_hifi); } +#endif audio_data->is_call_mode = is_call_mode_new; } } |