Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 252ec66a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd938x: Fix headset detection during SSR/PDR"

parents 78cf9161 4dcb7b2d

asoc/codecs/wcd937x/wcd937x.c

+2 −0
Original line number Diff line number Diff line
@@ -1580,6 +1580,7 @@ static int wcd937x_event_notify(struct notifier_block *block, 
					0x80, 0x00);

		break;

	case BOLERO_WCD_EVT_SSR_DOWN:

		wcd937x->mbhc->wcd_mbhc.deinit_in_progress = true;

		mbhc = &wcd937x->mbhc->wcd_mbhc;

		wcd937x_mbhc_ssr_down(wcd937x->mbhc, component);

		wcd937x_reset_low(wcd937x->dev);
@@ -1603,6 +1604,7 @@ static int wcd937x_event_notify(struct notifier_block *block, 
		} else {

			wcd937x_mbhc_hs_detect(component, mbhc->mbhc_cfg);

		}

		wcd937x->mbhc->wcd_mbhc.deinit_in_progress = false;

		break;

	default:

		dev_err(component->dev, "%s: invalid event %d\n", __func__,

asoc/codecs/wcd938x/wcd938x.c

+2 −0
Original line number Diff line number Diff line
@@ -1903,6 +1903,7 @@ static int wcd938x_event_notify(struct notifier_block *block, 
		break;

	case BOLERO_WCD_EVT_SSR_DOWN:

		wcd938x->dev_up = false;

		wcd938x->mbhc->wcd_mbhc.deinit_in_progress = true;

		mbhc = &wcd938x->mbhc->wcd_mbhc;

		wcd938x_mbhc_ssr_down(wcd938x->mbhc, component);

		wcd938x_reset_low(wcd938x->dev);
@@ -1927,6 +1928,7 @@ static int wcd938x_event_notify(struct notifier_block *block, 
		} else {

			wcd938x_mbhc_hs_detect(component, mbhc->mbhc_cfg);

		}

		wcd938x->mbhc->wcd_mbhc.deinit_in_progress = false;

		wcd938x->dev_up = true;

		break;

	case BOLERO_WCD_EVT_CLK_NOTIFY: