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

diff --git a/drivers/regulator/da9211-regulator.c b/drivers/regulator/da9211-regulator.c
index 1482ada..05f879a 100644 (file)
--- a/drivers/regulator/da9211-regulator.c
+++ b/drivers/regulator/da9211-regulator.c
@@ -282,7 +282,7 @@ static int da9211_regulator_init(struct da9211 *chip)
 
                if (chip->chip_irq != 0) {
                        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) {
                                dev_err(chip->dev,
                                        "Failed to update mask reg: %d\n", ret);

diff --git a/drivers/regulator/ltc3589.c b/drivers/regulator/ltc3589.c
index c756955..0ce8e4e 100644 (file)
--- a/drivers/regulator/ltc3589.c
+++ b/drivers/regulator/ltc3589.c
@@ -372,6 +372,7 @@ static bool ltc3589_volatile_reg(struct device *dev, unsigned int reg)
        switch (reg) {
        case LTC3589_IRQSTAT:
        case LTC3589_PGSTAT:
+       case LTC3589_VCCR:
                return true;
        }
        return false;

diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c
index 3ef67a8..7380af8 100644 (file)
--- a/drivers/regulator/tps65023-regulator.c
+++ b/drivers/regulator/tps65023-regulator.c
@@ -211,9 +211,6 @@ static int tps_65023_probe(struct i2c_client *client,
        int i;
        int error;
 
-       if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-               return -EIO;
-
        /**
         * init_data points to array of regulator_init structures
         * coming from the board-evm file.