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

Commit 3b4352bf authored by Viresh Kumar's avatar Viresh Kumar Committed by Alex Shi
Browse files

PM / OPP: Parse all power-supply related bindings together 



Move all DT parsing for the power supplies to a single function, rather
than keeping them at separate places. This will help manage things
properly.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit ad623c31485581d6b082ef92429db3b728739cd8)
Signed-off-by: default avatarAlex Shi <alex.shi@linaro.org>
parent 80d36b25

drivers/base/power/opp/core.c

+6 −5
Original line number Diff line number Diff line
@@ -772,9 +772,10 @@ unlock: 
}



/* TODO: Support multiple regulators */

static int opp_get_microvolt(struct dev_pm_opp *opp, struct device *dev)

static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev)

{

	u32 microvolt[3] = {0};

	u32 val;

	int count, ret;



	/* Missing property isn't a problem, but an invalid entry is */
@@ -807,6 +808,9 @@ static int opp_get_microvolt(struct dev_pm_opp *opp, struct device *dev) 
	opp->u_volt_min = microvolt[1];

	opp->u_volt_max = microvolt[2];



	if (!of_property_read_u32(opp->np, "opp-microamp", &val))

		opp->u_amp = val;



	return 0;

}
@@ -871,13 +875,10 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np) 
	if (!of_property_read_u32(np, "clock-latency-ns", &val))

		new_opp->clock_latency_ns = val;



	ret = opp_get_microvolt(new_opp, dev);

	ret = opp_parse_supplies(new_opp, dev);

	if (ret)

		goto free_opp;



	if (!of_property_read_u32(new_opp->np, "opp-microamp", &val))

		new_opp->u_amp = val;



	ret = _opp_add(dev, new_opp, dev_opp);

	if (ret)

		goto free_opp;