diff options
| author | Nikesh Oswal <noswal@nvidia.com> | 2013-01-03 20:52:37 +0530 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-01-16 19:13:30 -0800 |
| commit | f85ce9a5e1c44ac16d120a35a5796ff5cc4bb3a4 (patch) | |
| tree | fad6c803ba93a640d9a9dc43fa0e9fd685958406 | |
| parent | ec2fc4aed965609899900d6aba7ec71b98ac8791 (diff) | |
asoc: tegra: add control to set headset state
add alsa control to set headset switch state
Bug 1203124
Change-Id: Ieacf387e5a9b0d3215ad1e022fa5ab606618d44a
Signed-off-by: Nikesh Oswal <noswal@nvidia.com>
Reviewed-on: http://git-master/r/188337
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Scott Peterson <speterson@nvidia.com>
| -rw-r--r-- | sound/soc/tegra/tegra_asoc_utils.c | 49 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_asoc_utils.h | 1 |
2 files changed, 49 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c index df7d736fcb3b..21f8a21a4217 100644 --- a/sound/soc/tegra/tegra_asoc_utils.c +++ b/sound/soc/tegra/tegra_asoc_utils.c @@ -36,6 +36,13 @@ int g_is_call_mode; #ifdef CONFIG_SWITCH static bool is_switch_registered; +struct switch_dev *psdev; +/* These values are copied from WiredAccessoryObserver */ +enum headset_state { + BIT_NO_HEADSET = 0, + BIT_HEADSET = (1 << 0), + BIT_HEADSET_NO_MIC = (1 << 1), +}; #endif bool tegra_is_voice_call_active(void) @@ -195,6 +202,36 @@ struct snd_kcontrol_new tegra_avp_controls[] = { 0, tegra_get_dma_addr, tegra_set_dma_addr), }; +static int tegra_set_headset_plug_state(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct tegra_asoc_utils_data *data = snd_kcontrol_chip(kcontrol); + int switch_state; + + data->headset_plug_state = ucontrol->value.integer.value[0]; + switch_state = data->headset_plug_state == 1 ? BIT_HEADSET + : BIT_NO_HEADSET; + if (psdev) + switch_set_state(psdev, switch_state); + + return 1; +} + +static int tegra_get_headset_plug_state(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct tegra_asoc_utils_data *data = snd_kcontrol_chip(kcontrol); + + ucontrol->value.integer.value[0] = data->headset_plug_state; + + return 0; +} + +struct snd_kcontrol_new tegra_switch_controls = + SOC_SINGLE_EXT("Headset Plug State", 0, 0, 1, \ + 0, tegra_get_headset_plug_state, tegra_set_headset_plug_state); + + int tegra_asoc_utils_set_rate(struct tegra_asoc_utils_data *data, int srate, int mclk) { @@ -327,6 +364,13 @@ int tegra_asoc_utils_register_ctls(struct tegra_asoc_utils_data *data) } } + ret = snd_ctl_add(data->card->snd_card, + snd_ctl_new1(&tegra_switch_controls, data)); + if (ret < 0) { + dev_err(data->dev, "Can't add switch alsa control"); + return ret; + } + return ret; } EXPORT_SYMBOL_GPL(tegra_asoc_utils_register_ctls); @@ -487,8 +531,10 @@ int tegra_asoc_switch_register(struct switch_dev *sdev) ret = switch_dev_register(sdev); - if (ret >= 0) + if (ret >= 0) { + psdev = sdev; is_switch_registered = true; + } return ret; } @@ -501,6 +547,7 @@ void tegra_asoc_switch_unregister(struct switch_dev *sdev) switch_dev_unregister(sdev); is_switch_registered = false; + psdev = NULL; } EXPORT_SYMBOL_GPL(tegra_asoc_switch_unregister); #endif diff --git a/sound/soc/tegra/tegra_asoc_utils.h b/sound/soc/tegra/tegra_asoc_utils.h index dd4170d5dd0b..cee38064ddcb 100644 --- a/sound/soc/tegra/tegra_asoc_utils.h +++ b/sound/soc/tegra/tegra_asoc_utils.h @@ -48,6 +48,7 @@ struct tegra_asoc_utils_data { int lock_count; int avp_device_id; unsigned int avp_dma_addr; + int headset_plug_state; }; int tegra_asoc_utils_set_rate(struct tegra_asoc_utils_data *data, int srate, |