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

Commit 6a8007c8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/fix/isl9305', 'regulator/fix/rk808'... 

Merge remote-tracking branches 'regulator/fix/isl9305', 'regulator/fix/rk808' and 'regulator/fix/tps65023' into regulator-linus
parents 5a7ad114 0c08aaf8 75f88115 c90722b5

drivers/regulator/rk808-regulator.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -519,7 +519,7 @@ static const struct regulator_desc rk818_reg[] = { 
		RK818_LDO1_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,

		RK818_LDO1_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,

		BIT(0), 400),

		BIT(0), 400),

	RK8XX_DESC(RK818_ID_LDO2, "LDO_REG2", "vcc6", 1800, 3400, 100,

	RK8XX_DESC(RK818_ID_LDO2, "LDO_REG2", "vcc6", 1800, 3400, 100,

		RK818_LDO1_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,

		RK818_LDO2_ON_VSEL_REG, RK818_LDO_VSEL_MASK, RK818_LDO_EN_REG,

		BIT(1), 400),

		BIT(1), 400),

	{

	{

		.name = "LDO_REG3",

		.name = "LDO_REG3",

drivers/regulator/tps65023-regulator.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -311,8 +311,7 @@ static int tps_65023_probe(struct i2c_client *client, 




	/* Enable setting output voltage by I2C */

	/* Enable setting output voltage by I2C */

	regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2,

	regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2,

					TPS65023_REG_CTRL2_CORE_ADJ,

			   TPS65023_REG_CTRL2_CORE_ADJ, 0);

					TPS65023_REG_CTRL2_CORE_ADJ);





	return 0;

	return 0;

}

}

include/linux/platform_data/isl9305.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ 
struct regulator_init_data;

struct regulator_init_data;





struct isl9305_pdata {

struct isl9305_pdata {

	struct regulator_init_data *init_data[ISL9305_MAX_REGULATOR];

	struct regulator_init_data *init_data[ISL9305_MAX_REGULATOR + 1];

};

};





#endif
 
#endif