gpio: pca953x: Fix direction setting when configure an IRQ (0b22c25e) · Commits · 戴 / test

The commit ("gpio: pca953x: Zap ad-hoc reg_direction cache") seems inadvertently made a typo in pca953x_irq_bus_sync_unlock(). When the direction bit is 1 it means input, and the piece of code in question was looking for output ones that should be turned to inputs. Fix direction setting when configure an IRQ by injecting a bitmap complement operation. Fixes: ("gpio: pca953x: Zap ad-hoc reg_direction cache") Depends-on: ("gpio: pca953x: convert to use bitmap API") Cc: Marek Vasut <marek.vasut@gmail.com> Signed-off-by:

Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by:

Bartosz Golaszewski <bgolaszewski@baylibre.com>

drivers/gpio/gpio-pca953x.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -696,8 +696,6 @@ static void pca953x_irq_bus_sync_unlock(struct irq_data *d)
		DECLARE_BITMAP(reg_direction, MAX_LINE);
		int level;

		pca953x_read_regs(chip, chip->regs->direction, reg_direction);

		if (chip->driver_data & PCA_PCAL) {
		/* Enable latch on interrupt-enabled inputs */
		pca953x_write_regs(chip, PCAL953X_IN_LATCH, chip->irq_mask);
		@@ -708,7 +706,11 @@ static void pca953x_irq_bus_sync_unlock(struct irq_data *d)
		pca953x_write_regs(chip, PCAL953X_INT_MASK, irq_mask);
		}

		/* Switch direction to input if needed */
		pca953x_read_regs(chip, chip->regs->direction, reg_direction);

		bitmap_or(irq_mask, chip->irq_trig_fall, chip->irq_trig_raise, gc->ngpio);
		bitmap_complement(reg_direction, reg_direction, gc->ngpio);
		bitmap_and(irq_mask, irq_mask, reg_direction, gc->ngpio);

		/* Look for any newly setup interrupt */

Admin message