Commit b6c3af46 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

pinctrl: cy8c95x0: Don't miss reading the last bank registers 



When code had been changed to use for_each_set_clump8(), it mistakenly
switched from chip->nport to chip->tpin since the cy8c9540 and cy8c9560
have a 4-pin gap. This, in particular, led to the missed read of
the last bank interrupt status register and hence missing interrupts
on those pins. Restore the upper limit in for_each_set_clump8() to take
into consideration that gap.

Fixes: 83e29a7a ("pinctrl: cy8c95x0; Switch to use for_each_set_clump8()")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linusw@kernel.org>
parent 01e10d02

drivers/pinctrl/pinctrl-cy8c95x0.c

+2 −2
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ static int cy8c95x0_write_regs_mask(struct cy8c95x0_pinctrl *chip, int reg, 
	bitmap_scatter(tmask, mask, chip->map, MAX_LINE);

	bitmap_scatter(tval, val, chip->map, MAX_LINE);



	for_each_set_clump8(offset, bits, tmask, chip->tpin) {

	for_each_set_clump8(offset, bits, tmask, chip->nport * BANK_SZ) {

		unsigned int i = offset / 8;



		write_val = bitmap_get_value8(tval, offset);
@@ -655,7 +655,7 @@ static int cy8c95x0_read_regs_mask(struct cy8c95x0_pinctrl *chip, int reg, 
	bitmap_scatter(tmask, mask, chip->map, MAX_LINE);

	bitmap_scatter(tval, val, chip->map, MAX_LINE);



	for_each_set_clump8(offset, bits, tmask, chip->tpin) {

	for_each_set_clump8(offset, bits, tmask, chip->nport * BANK_SZ) {

		unsigned int i = offset / 8;



		ret = cy8c95x0_regmap_read_bits(chip, reg, i, bits, &read_val);