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

Commit 5260cd2b authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Mark Brown
Browse files

regulator: dt: regulator match by regulator-compatible 



Match the device's regulators with the property of
"regulator-compatible" of each regulator node.

Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent da26848a

drivers/regulator/of_regulator.c

+33 −18
Original line number Diff line number Diff line
@@ -92,15 +92,17 @@ struct regulator_init_data *of_get_regulator_init_data(struct device *dev, 
EXPORT_SYMBOL_GPL(of_get_regulator_init_data);



/**

 * of_regulator_match - extract regulator init data

 * of_regulator_match - extract regulator init data when node

 * property "regulator-compatible" matches with the regulator name.

 * @dev: device requesting the data

 * @node: parent device node of the regulators

 * @matches: match table for the regulators

 * @num_matches: number of entries in match table

 *

 * This function uses a match table specified by the regulator driver and

 * looks up the corresponding init data in the device tree. Note that the

 * match table is modified in place.

 * looks up the corresponding init data in the device tree  if

 * regulator-compatible matches. Note that the match table is modified

 * in place.

 *

 * Returns the number of matches found or a negative error code on failure.

 */
@@ -110,27 +112,40 @@ int of_regulator_match(struct device *dev, struct device_node *node, 
{

	unsigned int count = 0;

	unsigned int i;

	const char *regulator_comp;

	struct device_node *child;



	if (!dev || !node)

		return -EINVAL;



	for_each_child_of_node(node, child) {

		regulator_comp = of_get_property(child,

					"regulator-compatible", NULL);

		if (!regulator_comp) {

			dev_err(dev, "regulator-compatible is missing for node %s\n",

				child->name);

			continue;

		}

		for (i = 0; i < num_matches; i++) {

			struct of_regulator_match *match = &matches[i];

		struct device_node *child;

			if (match->of_node)

				continue;



		child = of_find_node_by_name(node, match->name);

		if (!child)

			if (strcmp(match->name, regulator_comp))

				continue;



		match->init_data = of_get_regulator_init_data(dev, child);

			match->init_data =

				of_get_regulator_init_data(dev, child);

			if (!match->init_data) {

			dev_err(dev, "failed to parse DT for regulator %s\n",

				dev_err(dev,

					"failed to parse DT for regulator %s\n",

					child->name);

				return -EINVAL;

			}



			match->of_node = child;

			count++;

			break;

		}

	}



	return count;