Commit 4d93b025 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branches 'regulator/fix/da9211', 'regulator/fix/ltc3589'...

Merge remote-tracking branches 'regulator/fix/da9211', 'regulator/fix/ltc3589' and 'regulator/fix/tps65023' into regulator-linus
...@@ -282,7 +282,7 @@ static int da9211_regulator_init(struct da9211 *chip) ...@@ -282,7 +282,7 @@ static int da9211_regulator_init(struct da9211 *chip)
if (chip->chip_irq != 0) { if (chip->chip_irq != 0) {
ret = regmap_update_bits(chip->regmap, ret = regmap_update_bits(chip->regmap,
DA9211_REG_MASK_B, DA9211_M_OV_CURR_A << i, 1); DA9211_REG_MASK_B, DA9211_M_OV_CURR_A << i, 0);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, dev_err(chip->dev,
"Failed to update mask reg: %d\n", ret); "Failed to update mask reg: %d\n", ret);
......
...@@ -372,6 +372,7 @@ static bool ltc3589_volatile_reg(struct device *dev, unsigned int reg) ...@@ -372,6 +372,7 @@ static bool ltc3589_volatile_reg(struct device *dev, unsigned int reg)
switch (reg) { switch (reg) {
case LTC3589_IRQSTAT: case LTC3589_IRQSTAT:
case LTC3589_PGSTAT: case LTC3589_PGSTAT:
case LTC3589_VCCR:
return true; return true;
} }
return false; return false;
......
...@@ -211,9 +211,6 @@ static int tps_65023_probe(struct i2c_client *client, ...@@ -211,9 +211,6 @@ static int tps_65023_probe(struct i2c_client *client,
int i; int i;
int error; int error;
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return -EIO;
/** /**
* init_data points to array of regulator_init structures * init_data points to array of regulator_init structures
* coming from the board-evm file. * coming from the board-evm file.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment