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

Commit 36ac914b authored by Xiaofan Tian's avatar Xiaofan Tian Committed by Mark Brown
Browse files

regmap: irq: Add mask invert flag for enable register 



Currently, regmap will write 1 to mask_base to mask
an interrupt and write 0 to unmask it.

But some chips do not have an interrupt mask register,
and only have interrupt enable register.
Then we should write 0 to disable interrupt and 1 to enable.

So add an mask_invert flag to handle this.
If it is not set, behavior is same as previous.
If set it to 1, the mask value will be inverted
before written to mask_base

Signed-off-by: default avatarXiaofan Tian <tianxf@marvell.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 7a976379

drivers/base/regmap/regmap-irq.c

+10 −2
Original line number Original line Diff line number Diff line
@@ -78,6 +78,10 @@ static void regmap_irq_sync_unlock(struct irq_data *data) 
	for (i = 0; i < d->chip->num_regs; i++) {

	for (i = 0; i < d->chip->num_regs; i++) {

		reg = d->chip->mask_base +

		reg = d->chip->mask_base +

			(i * map->reg_stride * d->irq_reg_stride);

			(i * map->reg_stride * d->irq_reg_stride);

		if (d->chip->mask_invert)

			ret = regmap_update_bits(d->map, reg,

					 d->mask_buf_def[i], ~d->mask_buf[i]);

		else

			ret = regmap_update_bits(d->map, reg,

			ret = regmap_update_bits(d->map, reg,

					 d->mask_buf_def[i], d->mask_buf[i]);

					 d->mask_buf_def[i], d->mask_buf[i]);

		if (ret != 0)

		if (ret != 0)
@@ -338,6 +342,10 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, 
		d->mask_buf[i] = d->mask_buf_def[i];

		d->mask_buf[i] = d->mask_buf_def[i];

		reg = chip->mask_base +

		reg = chip->mask_base +

			(i * map->reg_stride * d->irq_reg_stride);

			(i * map->reg_stride * d->irq_reg_stride);

		if (chip->mask_invert)

			ret = regmap_update_bits(map, reg,

					 d->mask_buf[i], ~d->mask_buf[i]);

		else

			ret = regmap_update_bits(map, reg,

			ret = regmap_update_bits(map, reg,

					 d->mask_buf[i], d->mask_buf[i]);

					 d->mask_buf[i], d->mask_buf[i]);

		if (ret != 0) {

		if (ret != 0) {

include/linux/regmap.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -300,6 +300,7 @@ struct regmap_irq_chip { 
	unsigned int ack_base;

	unsigned int ack_base;

	unsigned int wake_base;

	unsigned int wake_base;

	unsigned int irq_reg_stride;

	unsigned int irq_reg_stride;

	unsigned int mask_invert;

	bool runtime_pm;

	bool runtime_pm;





	int num_regs;

	int num_regs;