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

Unverified Commit 226d7449 authored by John Hsu's avatar John Hsu Committed by Mark Brown
Browse files

ASoC: nau8825: disable crosstalk by default 



The driver makes the crosstalk funciton disabled by default
which can simplify the codec function. The platform may not
need this funciton and reduce the potential risk. Therefore,
We change the property "nuvoton,crosstalk-bypass" to
"nuvoton,crosstalk-enable". The crosstalk measurement is enabled
if the property is set. Otherwise, it is disabled. Besides,
add more condition in the entry point of the crosstalk sequence
to disable the function completely.

Signed-off-by: default avatarJohn Hsu <KCHSU0@nuvoton.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4fbd8d19

Documentation/devicetree/bindings/sound/nau8825.txt

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ Optional properties: 
  - nuvoton,jack-insert-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms

  - nuvoton,jack-eject-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms



  - nuvoton,crosstalk-bypass: make crosstalk function bypass if set.

  - nuvoton,crosstalk-enable: make crosstalk function enable if set.



  - clocks: list of phandle and clock specifier pairs according to common clock bindings for the

      clocks described in clock-names
@@ -98,7 +98,7 @@ Example: 
      nuvoton,short-key-debounce = <2>;

      nuvoton,jack-insert-debounce = <7>;

      nuvoton,jack-eject-debounce = <7>;

      nuvoton,crosstalk-bypass;

      nuvoton,crosstalk-enable;



      clock-names = "mclk";

      clocks = <&tegra_car TEGRA210_CLK_CLK_OUT_2>;

sound/soc/codecs/nau8825.c

+13 −10
Original line number Diff line number Diff line
@@ -815,11 +815,12 @@ static void nau8825_xtalk_work(struct work_struct *work) 


static void nau8825_xtalk_cancel(struct nau8825 *nau8825)

{

	/* If the xtalk_protect is true, that means the process is still

	 * on going. The driver forces to cancel the cross talk task and

	/* If the crosstalk is eanbled and the process is on going,

	 * the driver forces to cancel the crosstalk task and

	 * restores the configuration to original status.

	 */

	if (nau8825->xtalk_protect) {

	if (nau8825->xtalk_enable && nau8825->xtalk_state !=

		NAU8825_XTALK_DONE) {

		cancel_work_sync(&nau8825->xtalk_work);

		nau8825_xtalk_clean(nau8825);

	}
@@ -1686,7 +1687,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->xtalk_bypass && !nau8825->high_imped) {

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

				/* Apply the cross talk suppression in the

				 * headset without high impedance.

				 */
@@ -1732,8 +1733,10 @@ static irqreturn_t nau8825_interrupt(int irq, void *data) 
			nau8825->xtalk_event_mask = event_mask;

		}

	} else if (active_irq & NAU8825_IMPEDANCE_MEAS_IRQ) {

		if (nau8825->xtalk_enable) {

			schedule_work(&nau8825->xtalk_work);

			clear_irq = NAU8825_IMPEDANCE_MEAS_IRQ;

		}

	} else if ((active_irq & NAU8825_JACK_INSERTION_IRQ_MASK) ==

		NAU8825_JACK_INSERTION_DETECTED) {

		/* One more step to check GPIO status directly. Thus, the
@@ -2440,8 +2443,8 @@ static void nau8825_print_device_properties(struct nau8825 *nau8825) 
			nau8825->jack_insert_debounce);

	dev_dbg(dev, "jack-eject-debounce:  %d\n",

			nau8825->jack_eject_debounce);

	dev_dbg(dev, "crosstalk-bypass:     %d\n",

			nau8825->xtalk_bypass);

	dev_dbg(dev, "crosstalk-enable:     %d\n",

			nau8825->xtalk_enable);

}



static int nau8825_read_device_properties(struct device *dev,
@@ -2506,8 +2509,8 @@ static int nau8825_read_device_properties(struct device *dev, 
		&nau8825->jack_eject_debounce);

	if (ret)

		nau8825->jack_eject_debounce = 0;

	nau8825->xtalk_bypass = device_property_read_bool(dev,

		"nuvoton,crosstalk-bypass");

	nau8825->xtalk_enable = device_property_read_bool(dev,

		"nuvoton,crosstalk-enable");



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

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

sound/soc/codecs/nau8825.h

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

	bool xtalk_protect;

	int imp_rms[NAU8825_XTALK_IMM];

	int xtalk_bypass;

	int xtalk_enable;

};



int nau8825_enable_jack_detect(struct snd_soc_codec *codec,