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

Commit 1840995c authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

PM / OPP: reuse of_parse_phandle() 



We already have a better API to get the opp descriptor block's node from
cpu-node. Lets reuse that instead of creating our own routines for the
same stuff. That cleans the code a lot.

This also kills a check we had earlier (as we are using the generic API
now). Earlier we used to check if the operating-points-v2 property
contained multiple phandles instead of a single phandle.

Killing this check isn't an issue because, we only parse the first entry
with of_parse_phandle(). So, if a user passes multiple phandles, its
really his problem :)

Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 6ff33f39

drivers/base/power/opp.c

+17 −54
Original line number Diff line number Diff line
@@ -1281,69 +1281,33 @@ void of_cpumask_free_opp_table(cpumask_var_t cpumask) 
}

EXPORT_SYMBOL_GPL(of_cpumask_free_opp_table);



/* Returns opp descriptor node from its phandle. Caller must do of_node_put() */

static struct device_node *

_of_get_opp_desc_node_from_prop(struct device *dev, const struct property *prop)

{

	struct device_node *opp_np;



	opp_np = of_find_node_by_phandle(be32_to_cpup(prop->value));

	if (!opp_np) {

		dev_err(dev, "%s: Prop: %s contains invalid opp desc phandle\n",

			__func__, prop->name);

		return ERR_PTR(-EINVAL);

	}



	return opp_np;

}



/* Returns opp descriptor node for a device. Caller must do of_node_put() */

/* Returns opp descriptor node for a device, caller must do of_node_put() */

static struct device_node *_of_get_opp_desc_node(struct device *dev)

{

	const struct property *prop;



	prop = of_find_property(dev->of_node, "operating-points-v2", NULL);

	if (!prop)

		return ERR_PTR(-ENODEV);

	if (!prop->value)

		return ERR_PTR(-ENODATA);



	/*

	 * TODO: Support for multiple OPP tables.

	 *

	 * There should be only ONE phandle present in "operating-points-v2"

	 * property.

	 */

	if (prop->length != sizeof(__be32)) {

		dev_err(dev, "%s: Invalid opp desc phandle\n", __func__);

		return ERR_PTR(-EINVAL);

	}



	return _of_get_opp_desc_node_from_prop(dev, prop);

	return of_parse_phandle(dev->of_node, "operating-points-v2", 0);

}



/* Initializes OPP tables based on new bindings */

static int _of_init_opp_table_v2(struct device *dev,

				 const struct property *prop)

				 struct device_node *opp_np)

{

	struct device_node *opp_np, *np;

	struct device_node *np;

	struct device_opp *dev_opp;

	int ret = 0, count = 0;



	if (!prop->value)

		return -ENODATA;



	/* Get opp node */

	opp_np = _of_get_opp_desc_node_from_prop(dev, prop);

	if (IS_ERR(opp_np))

		return PTR_ERR(opp_np);



	dev_opp = _managed_opp(opp_np);

	if (dev_opp) {

		/* OPPs are already managed */

		if (!_add_list_dev(dev, dev_opp))

			ret = -ENOMEM;

		goto put_opp_np;

		return ret;

	}



	/* We have opp-list node now, iterate over it and add OPPs */
@@ -1359,10 +1323,8 @@ static int _of_init_opp_table_v2(struct device *dev, 
	}



	/* There should be one of more OPP defined */

	if (WARN_ON(!count)) {

		ret = -ENOENT;

		goto put_opp_np;

	}

	if (WARN_ON(!count))

		return -ENOENT;



	dev_opp = _find_device_opp(dev);

	if (WARN_ON(IS_ERR(dev_opp))) {
@@ -1373,13 +1335,10 @@ static int _of_init_opp_table_v2(struct device *dev, 
	dev_opp->np = opp_np;

	dev_opp->shared_opp = of_property_read_bool(opp_np, "opp-shared");



	of_node_put(opp_np);

	return 0;



free_table:

	of_free_opp_table(dev);

put_opp_np:

	of_node_put(opp_np);



	return ret;

}
@@ -1446,14 +1405,15 @@ static int _of_init_opp_table_v1(struct device *dev) 
 */

int of_init_opp_table(struct device *dev)

{

	const struct property *prop;

	struct device_node *opp_np;

	int ret;



	/*

	 * OPPs have two version of bindings now. The older one is deprecated,

	 * try for the new binding first.

	 */

	prop = of_find_property(dev->of_node, "operating-points-v2", NULL);

	if (!prop) {

	opp_np = _of_get_opp_desc_node(dev);

	if (!opp_np) {

		/*

		 * Try old-deprecated bindings for backward compatibility with

		 * older dtbs.
@@ -1461,7 +1421,10 @@ int of_init_opp_table(struct device *dev) 
		return _of_init_opp_table_v1(dev);

	}



	return _of_init_opp_table_v2(dev, prop);

	ret = _of_init_opp_table_v2(dev, opp_np);

	of_node_put(opp_np);



	return ret;

}

EXPORT_SYMBOL_GPL(of_init_opp_table);
@@ -1550,7 +1513,7 @@ int of_get_cpus_sharing_opps(struct device *cpu_dev, cpumask_var_t cpumask) 


	/* Get OPP descriptor node */

	np = _of_get_opp_desc_node(cpu_dev);

	if (IS_ERR(np)) {

	if (!np) {

		dev_dbg(cpu_dev, "%s: Couldn't find opp node: %ld\n", __func__,

			PTR_ERR(np));

		return -ENOENT;
@@ -1574,7 +1537,7 @@ int of_get_cpus_sharing_opps(struct device *cpu_dev, cpumask_var_t cpumask) 


		/* Get OPP descriptor node */

		tmp_np = _of_get_opp_desc_node(tcpu_dev);

		if (IS_ERR(tmp_np)) {

		if (!tmp_np) {

			dev_err(tcpu_dev, "%s: Couldn't find opp node: %ld\n",

				__func__, PTR_ERR(tmp_np));

			ret = PTR_ERR(tmp_np);