iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpio: pca953x: Zap ad-hoc reg_output cache

Browse Source 
Replace the ad-hoc reg_output output register caching with generic
regcache cache. Drop pca953x_write_single() which is no longer used.
This reduces code duplication.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Marek Vasut 2018-12-12 02:40:00 +01:00 committed by Linus Walleij
parent 0f25fda840
commit ec82d1eba3
1 changed files with 15 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
drivers/gpio/gpio-pca953x.c
View File

@ -141,7 +141,6 @@ static const struct pca953x_reg_config pca957x_regs = {
struct pca953x_chip { struct pca953x_chip {
unsigned gpio_start; unsigned gpio_start;
u8 reg_output[MAX_BANK];
struct mutex i2c_lock; struct mutex i2c_lock;
struct regmap *regmap; struct regmap *regmap;
@ -340,21 +339,6 @@ static int pca953x_read_single(struct pca953x_chip *chip, int reg, u32 *val,
return 0; return 0;
} }
static int pca953x_write_single(struct pca953x_chip *chip, int reg, u32 val,
int off)
{
u8 regaddr = pca953x_recalc_addr(chip, reg, off, true, false);
int ret;
ret = regmap_write(chip->regmap, regaddr, val);
if (ret < 0) {
dev_err(&chip->client->dev, "failed writing register\n");
return ret;
}
return 0;
}
static int pca953x_write_regs(struct pca953x_chip *chip, int reg, u8 *val) static int pca953x_write_regs(struct pca953x_chip *chip, int reg, u8 *val)
{ {
u8 regaddr = pca953x_recalc_addr(chip, reg, 0, true, true); u8 regaddr = pca953x_recalc_addr(chip, reg, 0, true, true);
@ -403,25 +387,17 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc,
struct pca953x_chip *chip = gpiochip_get_data(gc); struct pca953x_chip *chip = gpiochip_get_data(gc);
u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off, u8 dirreg = pca953x_recalc_addr(chip, chip->regs->direction, off,
true, false); true, false);
u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off,
true, false);
u8 bit = BIT(off % BANK_SZ); u8 bit = BIT(off % BANK_SZ);
u8 reg_val;
int ret; int ret;
mutex_lock(&chip->i2c_lock); mutex_lock(&chip->i2c_lock);
/* set output level */ /* set output level */
if (val) ret = regmap_write_bits(chip->regmap, outreg, bit, val ? bit : 0);
reg_val = chip->reg_output[off / BANK_SZ]
| (1u << (off % BANK_SZ));
else
reg_val = chip->reg_output[off / BANK_SZ]
& ~(1u << (off % BANK_SZ));
ret = pca953x_write_single(chip, chip->regs->output, reg_val, off);
if (ret) if (ret)
goto exit; goto exit;
chip->reg_output[off / BANK_SZ] = reg_val;
/* then direction */ /* then direction */
ret = regmap_write_bits(chip->regmap, dirreg, bit, 0); ret = regmap_write_bits(chip->regmap, dirreg, bit, 0);
exit: exit:
@ -452,23 +428,12 @@ static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off)
static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val) static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val)
{ {
struct pca953x_chip *chip = gpiochip_get_data(gc); struct pca953x_chip *chip = gpiochip_get_data(gc);
u8 reg_val; u8 outreg = pca953x_recalc_addr(chip, chip->regs->output, off,
int ret; true, false);
u8 bit = BIT(off % BANK_SZ);
mutex_lock(&chip->i2c_lock); mutex_lock(&chip->i2c_lock);
if (val) regmap_write_bits(chip->regmap, outreg, bit, val ? bit : 0);
reg_val = chip->reg_output[off / BANK_SZ]
| (1u << (off % BANK_SZ));
else
reg_val = chip->reg_output[off / BANK_SZ]
& ~(1u << (off % BANK_SZ));
ret = pca953x_write_single(chip, chip->regs->output, reg_val, off);
if (ret)
goto exit;
chip->reg_output[off / BANK_SZ] = reg_val;
exit:
mutex_unlock(&chip->i2c_lock); mutex_unlock(&chip->i2c_lock);
} }
@ -500,7 +465,10 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc,
int ret; int ret;
mutex_lock(&chip->i2c_lock); mutex_lock(&chip->i2c_lock);
memcpy(reg_val, chip->reg_output, NBANK(chip)); ret = pca953x_read_regs(chip, chip->regs->output, reg_val);
if (ret)
goto exit;
for (bank = 0; bank < NBANK(chip); bank++) { for (bank = 0; bank < NBANK(chip); bank++) {
bank_mask = mask[bank / sizeof(*mask)] >> bank_mask = mask[bank / sizeof(*mask)] >>
((bank % sizeof(*mask)) * 8); ((bank % sizeof(*mask)) * 8);
@ -512,11 +480,7 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc,
} }
} }
ret = pca953x_write_regs(chip, chip->regs->output, reg_val); pca953x_write_regs(chip, chip->regs->output, reg_val);
if (ret)
goto exit;
memcpy(chip->reg_output, reg_val, NBANK(chip));
exit: exit:
mutex_unlock(&chip->i2c_lock); mutex_unlock(&chip->i2c_lock);
} }
@ -818,8 +782,9 @@ static int device_pca95xx_init(struct pca953x_chip *chip, u32 invert)
int ret; int ret;
u8 val[MAX_BANK]; u8 val[MAX_BANK];
ret = pca953x_read_regs(chip, chip->regs->output, chip->reg_output); ret = regcache_sync_region(chip->regmap, chip->regs->output,
if (ret) chip->regs->output + NBANK(chip));
if (ret != 0)
goto out; goto out;
ret = regcache_sync_region(chip->regmap, chip->regs->direction, ret = regcache_sync_region(chip->regmap, chip->regs->direction,