Merge remote-tracking branches 'regulator/fix/da9211', 'regulator/fix/ltc3589' and...
authorMark Brown <broonie@kernel.org>
Tue, 30 Sep 2014 12:50:23 +0000 (13:50 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 30 Sep 2014 12:50:23 +0000 (13:50 +0100)
drivers/regulator/da9211-regulator.c
drivers/regulator/ltc3589.c
drivers/regulator/tps65023-regulator.c

index 1482adafa1ad43eafa970c53b671b264c1e1a572..05f879a5d24e704f71e1d12820aada5d78a5d317 100644 (file)
@@ -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);
index c756955bfcc5a1a512c959d4f0e3731733fbeb83..0ce8e4e0fa7308dfd5056a0553ad7b5d9050b4a3 100644 (file)
@@ -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;
index 3ef67a86115c9c09e0196915c17f745d0099bb31..7380af8bd50d4e8d699f7564c6ab4bb3e4edc84b 100644 (file)
@@ -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.