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

Commit c98137bf authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: arizona: Don't request FLL lock IRQ 



We only log the result and since the interrupt triggers on loss of lock
during shutdown this may lead to spurious interrupts during shutdown
delaying the process.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f48aa392

sound/soc/codecs/arizona.c

+0 −19
Original line number Diff line number Diff line
@@ -897,17 +897,6 @@ int arizona_init_dai(struct arizona_priv *priv, int id) 
}

EXPORT_SYMBOL_GPL(arizona_init_dai);



static irqreturn_t arizona_fll_lock(int irq, void *data)

{

	struct arizona_fll *fll = data;



	arizona_fll_dbg(fll, "Lock status changed\n");



	complete(&fll->lock);



	return IRQ_HANDLED;

}



static irqreturn_t arizona_fll_clock_ok(int irq, void *data)

{

	struct arizona_fll *fll = data;
@@ -1147,7 +1136,6 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq, 
{

	int ret;



	init_completion(&fll->lock);

	init_completion(&fll->ok);



	fll->id = id;
@@ -1158,13 +1146,6 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq, 
	snprintf(fll->clock_ok_name, sizeof(fll->clock_ok_name),

		 "FLL%d clock OK", id);



	ret = arizona_request_irq(arizona, lock_irq, fll->lock_name,

				  arizona_fll_lock, fll);

	if (ret != 0) {

		dev_err(arizona->dev, "Failed to get FLL%d lock IRQ: %d\n",

			id, ret);

	}



	ret = arizona_request_irq(arizona, ok_irq, fll->clock_ok_name,

				  arizona_fll_clock_ok, fll);

	if (ret != 0) {

sound/soc/codecs/arizona.h

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ struct arizona_fll { 
	int id;

	unsigned int base;

	unsigned int vco_mult;

	struct completion lock;

	struct completion ok;

	unsigned int fref;

	unsigned int fout;