Merge tag 'regulator-fix-v5.5-rc5' of... (5acefdc2) · Commits · 戴 / test

drivers/regulator/axp20x-regulator.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -413,10 +413,13 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
		int i;

		for (i = 0; i < rate_count; i++) {
		if (ramp <= slew_rates[i])
		cfg = AXP20X_DCDC2_LDO3_V_RAMP_LDO3_RATE(i);
		else
		if (ramp > slew_rates[i])
		break;

		if (id == AXP20X_DCDC2)
		cfg = AXP20X_DCDC2_LDO3_V_RAMP_DCDC2_RATE(i);
		else
		cfg = AXP20X_DCDC2_LDO3_V_RAMP_LDO3_RATE(i);
		}

		if (cfg == 0xff) {
		@@ -605,7 +608,7 @@ static const struct regulator_desc axp22x_regulators[] = {
		AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO1_MASK),
		AXP_DESC(AXP22X, ELDO2, "eldo2", "eldoin", 700, 3300, 100,
		AXP22X_ELDO2_V_OUT, AXP22X_ELDO2_V_OUT_MASK,
		AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO1_MASK),
		AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO2_MASK),
		AXP_DESC(AXP22X, ELDO3, "eldo3", "eldoin", 700, 3300, 100,
		AXP22X_ELDO3_V_OUT, AXP22X_ELDO3_V_OUT_MASK,
		AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO3_MASK),

+0 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,6 @@ static const struct regulator_ops bd70528_ldo_ops = {
		.set_voltage_sel = regulator_set_voltage_sel_regmap,
		.get_voltage_sel = regulator_get_voltage_sel_regmap,
		.set_voltage_time_sel = regulator_set_voltage_time_sel,
		.set_ramp_delay = bd70528_set_ramp_delay,
		};

		static const struct regulator_ops bd70528_led_ops = {