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

Commit 2bda4288 authored by John Hsu's avatar John Hsu Committed by Mark Brown
Browse files

ASoC: nau8825: make crosstalk function optional 



Make crosstalk functoin optional.
The jack detection can speed up without crosstalk detection.
Let the decision of function usage to platform design.

The patch helps the issue concern as follows:
Google issue 35574278: Chell_headphone pop back from S3

There is a concern as follows:
cras getting blocked for 2 seconds (worst-case 3 seconds)
As I understand, ChromeOS expects resume finishes in 1 seconds.
Video/Audio playing after 3 seconds of resume seems against the spec.
If we really have to make the choice I would choose pop noise instead
of waiting for 3 seconds.

Signed-off-by: default avatarJohn Hsu <KCHSU0@nuvoton.com>
Signed-off-by: default avatarJohn Hsu <supercraig0719@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8fe19795

sound/soc/codecs/nau8825.c

+5 −1
Original line number Diff line number Diff line
@@ -1686,7 +1686,7 @@ static irqreturn_t nau8825_interrupt(int irq, void *data) 
	} else if (active_irq & NAU8825_HEADSET_COMPLETION_IRQ) {

		if (nau8825_is_jack_inserted(regmap)) {

			event |= nau8825_jack_insert(nau8825);

			if (!nau8825->high_imped) {

			if (!nau8825->xtalk_bypass && !nau8825->high_imped) {

				/* Apply the cross talk suppression in the

				 * headset without high impedance.

				 */
@@ -2504,6 +2504,10 @@ static int nau8825_read_device_properties(struct device *dev, 
		&nau8825->jack_eject_debounce);

	if (ret)

		nau8825->jack_eject_debounce = 0;

	ret = device_property_read_u32(dev, "nuvoton,crosstalk-bypass",

		&nau8825->xtalk_bypass);

	if (ret)

		nau8825->xtalk_bypass = 1;



	nau8825->mclk = devm_clk_get(dev, "mclk");

	if (PTR_ERR(nau8825->mclk) == -EPROBE_DEFER) {

sound/soc/codecs/nau8825.h

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ struct nau8825 { 
	int xtalk_event_mask;

	bool xtalk_protect;

	int imp_rms[NAU8825_XTALK_IMM];

	int xtalk_bypass;

};



int nau8825_enable_jack_detect(struct snd_soc_codec *codec,