Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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
parents fe82dcec 4e7089f3 c5bb725a 32205741

drivers/regulator/da9211-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/regulator/ltc3589.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/regulator/tps65023-regulator.c

+0 −3
Original line number Diff line number Diff line
@@ -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.