mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-14 12:37:32 +00:00
Code Issues Releases Wiki Activity

greybus: audio: Identify jack type based on attributes reported

Browse source 
Originally, idea was to use widget_type to identify jack_type.
However, suggestive way is to identify jack based on jack
attributes.

Changes already exists in codec FW to report jack attributes.

Signed-off-by: Vaibhav Agarwal <vaibhav.agarwal@linaro.org>
Reviewed-by: Mark Greer <mgreer@animalcreek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Vaibhav Agarwal 2016-04-13 09:53:39 +05:30 committed by Greg Kroah-Hartman
parent 475f498bce
commit 05ab5f0daa
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/staging/greybus/audio_module.c
View file

@ -27,7 +27,7 @@ static int gbaudio_request_jack(struct gbaudio_module_info *module,
int report, button_status;
dev_warn(module->dev, "Jack Event received: type: %u, event: %u\n",
req->widget_type, req->event);
req->jack_attribute, req->event);
mutex_lock(&module->lock);
if (req->event == GB_AUDIO_JACK_EVENT_REMOVAL) {
@ -43,18 +43,9 @@ static int gbaudio_request_jack(struct gbaudio_module_info *module,
return 0;
}
report &= ~GBCODEC_JACK_MASK;
/* currently supports Headphone, Headset & Lineout only */
if (req->widget_type && GB_AUDIO_WIDGET_TYPE_HP)
report |= SND_JACK_HEADPHONE & GBCODEC_JACK_MASK;
if (req->widget_type && GB_AUDIO_WIDGET_TYPE_MIC)
report = SND_JACK_MICROPHONE & GBCODEC_JACK_MASK;
if (req->widget_type && GB_AUDIO_WIDGET_TYPE_LINE)
report = (report & GBCODEC_JACK_MASK) |
SND_JACK_LINEOUT | SND_JACK_LINEIN;
report &= ~GBCODEC_JACK_MASK;
report |= req->jack_attribute & GBCODEC_JACK_MASK;
if (module->jack_type)
dev_warn(module->dev, "Modifying jack from %d to %d\n",
module->jack_type, report);