Merge tag 'gpio-fixes-for-v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / drivers / gpio / gpio-pca953x.c

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index b444c6ab958bfd0681fda824ee0b76109d83f78c..08bc52c3cdcbedb19c170488caa101daf9f9f932 100644 (file)
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -1120,20 +1120,21 @@ static int pca953x_regcache_sync(struct device *dev)
 {
        struct pca953x_chip *chip = dev_get_drvdata(dev);
        int ret;
+       u8 regaddr;
 
        /*
         * The ordering between direction and output is important,
         * sync these registers first and only then sync the rest.
         */
-       ret = regcache_sync_region(chip->regmap, chip->regs->direction,
-                                  chip->regs->direction + NBANK(chip));
+       regaddr = pca953x_recalc_addr(chip, chip->regs->direction, 0);
+       ret = regcache_sync_region(chip->regmap, regaddr, regaddr + NBANK(chip));
        if (ret) {
                dev_err(dev, "Failed to sync GPIO dir registers: %d\n", ret);
                return ret;
        }
 
-       ret = regcache_sync_region(chip->regmap, chip->regs->output,
-                                  chip->regs->output + NBANK(chip));
+       regaddr = pca953x_recalc_addr(chip, chip->regs->output, 0);
+       ret = regcache_sync_region(chip->regmap, regaddr, regaddr + NBANK(chip));
        if (ret) {
                dev_err(dev, "Failed to sync GPIO out registers: %d\n", ret);
                return ret;
@@ -1141,16 +1142,18 @@ static int pca953x_regcache_sync(struct device *dev)
 
 #ifdef CONFIG_GPIO_PCA953X_IRQ
        if (chip->driver_data & PCA_PCAL) {
-               ret = regcache_sync_region(chip->regmap, PCAL953X_IN_LATCH,
-                                          PCAL953X_IN_LATCH + NBANK(chip));
+               regaddr = pca953x_recalc_addr(chip, PCAL953X_IN_LATCH, 0);
+               ret = regcache_sync_region(chip->regmap, regaddr,
+                                          regaddr + NBANK(chip));
                if (ret) {
                        dev_err(dev, "Failed to sync INT latch registers: %d\n",
                                ret);
                        return ret;
                }
 
-               ret = regcache_sync_region(chip->regmap, PCAL953X_INT_MASK,
-                                          PCAL953X_INT_MASK + NBANK(chip));
+               regaddr = pca953x_recalc_addr(chip, PCAL953X_INT_MASK, 0);
+               ret = regcache_sync_region(chip->regmap, regaddr,
+                                          regaddr + NBANK(chip));
                if (ret) {
                        dev_err(dev, "Failed to sync INT mask registers: %d\n",
                                ret);