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

Commit def8b72f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v5.3-5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:
 "All related to the PCA953x driver when handling chips with more than 8
  ports, now that works again"

* tag 'gpio-v5.3-5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: pca953x: use pca953x_read_regs instead of regmap_bulk_read
  gpio: pca953x: correct type of reg_direction
parents 950b07c1 89f2c042

drivers/gpio/gpio-pca953x.c

+6 −9
Original line number Diff line number Diff line
@@ -604,10 +604,9 @@ static void pca953x_irq_bus_sync_unlock(struct irq_data *d) 
	u8 new_irqs;

	int level, i;

	u8 invert_irq_mask[MAX_BANK];

	int reg_direction[MAX_BANK];

	u8 reg_direction[MAX_BANK];



	regmap_bulk_read(chip->regmap, chip->regs->direction, reg_direction,

			 NBANK(chip));

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



	if (chip->driver_data & PCA_PCAL) {

		/* Enable latch on interrupt-enabled inputs */
@@ -679,7 +678,7 @@ static bool pca953x_irq_pending(struct pca953x_chip *chip, u8 *pending) 
	bool pending_seen = false;

	bool trigger_seen = false;

	u8 trigger[MAX_BANK];

	int reg_direction[MAX_BANK];

	u8 reg_direction[MAX_BANK];

	int ret, i;



	if (chip->driver_data & PCA_PCAL) {
@@ -710,8 +709,7 @@ static bool pca953x_irq_pending(struct pca953x_chip *chip, u8 *pending) 
		return false;



	/* Remove output pins from the equation */

	regmap_bulk_read(chip->regmap, chip->regs->direction, reg_direction,

			 NBANK(chip));

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

	for (i = 0; i < NBANK(chip); i++)

		cur_stat[i] &= reg_direction[i];
@@ -768,7 +766,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, 
{

	struct i2c_client *client = chip->client;

	struct irq_chip *irq_chip = &chip->irq_chip;

	int reg_direction[MAX_BANK];

	u8 reg_direction[MAX_BANK];

	int ret, i;



	if (!client->irq)
@@ -789,8 +787,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, 
	 * interrupt.  We have to rely on the previous read for

	 * this purpose.

	 */

	regmap_bulk_read(chip->regmap, chip->regs->direction, reg_direction,

			 NBANK(chip));

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

	for (i = 0; i < NBANK(chip); i++)

		chip->irq_stat[i] &= reg_direction[i];

	mutex_init(&chip->irq_lock);