TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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 Tommy Webb
parent f5eb8b9164
commit eda293580e
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

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

2
techpack/audio/include/asoc/wcd-mbhc-v2.h
View File

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