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

Commit e60781b4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/fix/tps65218' into regulator-tps65218

parents 5f986f7c 42ab0f39

drivers/regulator/tps65218-regulator.c

+3 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static const struct regulator_linear_range ldo1_dcdc3_ranges[] = { 


static const struct regulator_linear_range dcdc4_ranges[] = {

	REGULATOR_LINEAR_RANGE(1175000, 0x0, 0xf, 25000),

	REGULATOR_LINEAR_RANGE(1550000, 0x10, 0x34, 50000),

	REGULATOR_LINEAR_RANGE(1600000, 0x10, 0x34, 50000),

};



static struct tps_info tps65218_pmic_regs[] = {
@@ -209,7 +209,7 @@ static const struct regulator_desc regulators[] = { 
			   1, -1, -1, TPS65218_REG_ENABLE1,

			   TPS65218_ENABLE1_DC6_EN, NULL, NULL, 0, 0),

	TPS65218_REGULATOR("LDO1", TPS65218_LDO_1, tps65218_ldo1_dcdc34_ops, 64,

			   TPS65218_REG_CONTROL_DCDC4,

			   TPS65218_REG_CONTROL_LDO1,

			   TPS65218_CONTROL_LDO1_MASK, TPS65218_REG_ENABLE2,

			   TPS65218_ENABLE2_LDO1_EN, NULL, ldo1_dcdc3_ranges,

			   2, 0),
@@ -240,6 +240,7 @@ static int tps65218_regulator_probe(struct platform_device *pdev) 
	config.init_data = init_data;

	config.driver_data = tps;

	config.regmap = tps->regmap;

	config.of_node = pdev->dev.of_node;



	rdev = devm_regulator_register(&pdev->dev, &regulators[id], &config);

	if (IS_ERR(rdev)) {