Commit 234506ad authored by Stephen Warren's avatar Stephen Warren Committed by Lee Jones
Browse files

mfd: tps6586x: Implement irq_set_wake 



rtc-tps6586x calls enable/disable_irq_wake() during suspend/resume. Since
the main tps6586x irq_chip doesn't implement .irq_set_wake, this causes
the RTC's enable_irq_wake() to fail, and the disable_irq_wake() to spew a
WARN about unbalanced wake disable. Solve this by implementing
.irq_set_wake.

Also, I assume that enable_irq_wake() shouldn't be called unconditionally
in tps6586x_irq_init(), since this is now triggered by IRQ children
setting up their cascaded IRQs for wake. So, remove that.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent b5f90240

drivers/mfd/tps6586x.c

+15 −3
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ struct tps6586x { 
	struct i2c_client	*client;

	struct regmap		*regmap;



	int			irq;

	struct irq_chip		irq_chip;

	struct mutex		irq_lock;

	int			irq_base;
@@ -261,12 +262,23 @@ static void tps6586x_irq_sync_unlock(struct irq_data *data) 
	mutex_unlock(&tps6586x->irq_lock);

}



#ifdef CONFIG_PM_SLEEP

static int tps6586x_irq_set_wake(struct irq_data *irq_data, unsigned int on)

{

	struct tps6586x *tps6586x = irq_data_get_irq_chip_data(irq_data);

	return irq_set_irq_wake(tps6586x->irq, on);

}

#else

#define tps6586x_irq_set_wake NULL

#endif



static struct irq_chip tps6586x_irq_chip = {

	.name = "tps6586x",

	.irq_bus_lock = tps6586x_irq_lock,

	.irq_bus_sync_unlock = tps6586x_irq_sync_unlock,

	.irq_disable = tps6586x_irq_disable,

	.irq_enable = tps6586x_irq_enable,

	.irq_set_wake = tps6586x_irq_set_wake,

};



static int tps6586x_irq_map(struct irq_domain *h, unsigned int virq,
@@ -331,6 +343,8 @@ static int tps6586x_irq_init(struct tps6586x *tps6586x, int irq, 
	int new_irq_base;

	int irq_num = ARRAY_SIZE(tps6586x_irqs);



	tps6586x->irq = irq;



	mutex_init(&tps6586x->irq_lock);

	for (i = 0; i < 5; i++) {

		tps6586x->mask_reg[i] = 0xff;
@@ -360,10 +374,8 @@ static int tps6586x_irq_init(struct tps6586x *tps6586x, int irq, 
	ret = request_threaded_irq(irq, NULL, tps6586x_irq, IRQF_ONESHOT,

				   "tps6586x", tps6586x);



	if (!ret) {

	if (!ret)

		device_init_wakeup(tps6586x->dev, 1);

		enable_irq_wake(irq);

	}



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE