Unverified Commit 9273aa85 authored by Cristian Ciocaltea's avatar Cristian Ciocaltea Committed by Mark Brown
Browse files

ASoC: nau8821: Generalize helper to clear IRQ status 



Instead of adding yet another utility function for dealing with the
interrupt clearing register, generalize nau8821_int_status_clear_all()
by renaming it to nau8821_irq_status_clear(), whilst introducing a
second parameter to allow restricting the operation scope to a single
interrupt instead of the whole range of active IRQs.

While at it, also fix a spelling typo in the comment block.

Note this is mainly a prerequisite for subsequent patches aiming to
address some deficiencies in the implementation of the interrupt
handler.  Thus the presence of the Fixes tag below is intentional, to
facilitate backporting.

Fixes: aab1ad11 ("ASoC: nau8821: new driver")
Signed-off-by: default avatarCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://patch.msgid.link/20251003-nau8821-jdet-fixes-v1-2-f7b0e2543f09@collabora.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6e54919c

sound/soc/codecs/nau8821.c

+11 −6
Original line number Diff line number Diff line
@@ -1021,12 +1021,17 @@ static bool nau8821_is_jack_inserted(struct regmap *regmap) 
	return active_high == is_high;

}



static void nau8821_int_status_clear_all(struct regmap *regmap)

static void nau8821_irq_status_clear(struct regmap *regmap, int active_irq)

{

	int active_irq, clear_irq, i;

	int clear_irq, i;



	/* Reset the intrruption status from rightmost bit if the corres-

	 * ponding irq event occurs.

	if (active_irq) {

		regmap_write(regmap, NAU8821_R11_INT_CLR_KEY_STATUS, active_irq);

		return;

	}



	/* Reset the interruption status from rightmost bit if the

	 * corresponding irq event occurs.

	 */

	regmap_read(regmap, NAU8821_R10_IRQ_STATUS, &active_irq);

	for (i = 0; i < NAU8821_REG_DATA_LEN; i++) {
@@ -1053,7 +1058,7 @@ static void nau8821_eject_jack(struct nau8821 *nau8821) 
	snd_soc_dapm_sync(dapm);



	/* Clear all interruption status */

	nau8821_int_status_clear_all(regmap);

	nau8821_irq_status_clear(regmap, 0);



	/* Enable the insertion interruption, disable the ejection inter-

	 * ruption, and then bypass de-bounce circuit.
@@ -1522,7 +1527,7 @@ static int nau8821_resume_setup(struct nau8821 *nau8821) 
	nau8821_configure_sysclk(nau8821, NAU8821_CLK_DIS, 0);

	if (nau8821->irq) {

		/* Clear all interruption status */

		nau8821_int_status_clear_all(regmap);

		nau8821_irq_status_clear(regmap, 0);



		/* Enable both insertion and ejection interruptions, and then

		 * bypass de-bounce circuit.