joy/android_kernel_sony_sdm845
Watch
1
Fork
You've already forked android_kernel_sony_sdm845
 0
Code Issues Pull requests Projects Releases Wiki Activity

ASOC: Remove support for ANC headphones

Browse source 
ANC headphones are no longer supported, removed dead code related to the feature.

Change-Id: I3dd51b5b1d9f77fd870947608f8a14fc3f7aeed0
Signed-off-by: Akhil Karuturi <akarutur@codeaurora.org>
This commit is contained in:
Akhil Karuturi 2020-04-23 18:57:36 -07:00 • committed by Michael Bestas
commit c7ff74cdcc
No known key found for this signature in database
GPG key ID: CC95044519BE6669
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
techpack/audio/asoc/codecs/wcd-mbhc-v2.c
View file

@ -656,7 +656,6 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion,
}
mbhc->hph_status &= ~(SND_JACK_HEADSET |
SND_JACK_LINEOUT |
SND_JACK_ANC_HEADPHONE |
SND_JACK_UNSUPPORTED);
mbhc->force_linein = false;
}
@ -675,8 +674,9 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion,
mbhc->jiffies_atreport = jiffies;
} else if (jack_type == SND_JACK_LINEOUT) {
mbhc->current_plug = MBHC_PLUG_TYPE_HIGH_HPH;
} else if (jack_type == SND_JACK_ANC_HEADPHONE)
mbhc->current_plug = MBHC_PLUG_TYPE_ANC_HEADPHONE;
} else {
pr_debug("%s: invalid Jack type %d\n",__func__, jack_type);
}
if (mbhc->mbhc_cb->hph_pa_on_status)
is_pa_on = mbhc->mbhc_cb->hph_pa_on_status(codec);
@ -803,8 +803,6 @@ void wcd_mbhc_find_plug_and_report(struct wcd_mbhc *mbhc,
anc_mic_found =
mbhc->mbhc_fn->wcd_mbhc_detect_anc_plug_type(mbhc);
jack_type = SND_JACK_HEADSET;
if (anc_mic_found)
jack_type = SND_JACK_ANC_HEADPHONE;
/*
* If Headphone was reported previously, this will
@ -944,9 +942,6 @@ static void wcd_mbhc_swch_irq_handler(struct wcd_mbhc *mbhc)
mbhc->is_extn_cable = false;
jack_type = SND_JACK_LINEOUT;
break;
case MBHC_PLUG_TYPE_ANC_HEADPHONE:
jack_type = SND_JACK_ANC_HEADPHONE;
break;
default:
pr_info("%s: Invalid current plug: %d\n",
__func__, mbhc->current_plug);

2
techpack/audio/asoc/codecs/wcd-mbhc-v2.h
View file

@ -131,7 +131,7 @@ do { \
#define WCD_MBHC_JACK_MASK (SND_JACK_HEADSET | SND_JACK_OC_HPHL | \
SND_JACK_OC_HPHR | SND_JACK_LINEOUT | \
SND_JACK_MECHANICAL | SND_JACK_MICROPHONE2 | \
SND_JACK_MECHANICAL | \
SND_JACK_UNSUPPORTED)
#define WCD_MBHC_JACK_BUTTON_MASK (SND_JACK_BTN_0 | SND_JACK_BTN_1 | \