Commit 13511def authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

regulator: deprecate regulator-compatible DT property 



When the bindings for the TPS6586x regulator were being proposed, I
asserted that DT node naming rules for bus child nodes should also be
applied to nodes inside the TPS6586x regulator node itself. In other
words, that each node providing regulator init data should be named
after the type of object it represented ("regulator") and hence that
some other property was required to indicate which regulator the node
described ("regulator-compatible"). In turn this led to multiple nodes
having the same name, thus requiring node names to use a unit address
to make them unique, thus requiring reg properties within the nodes and

However, subsequent discussion indicates that the rules I was asserting
only applies to standardized bus nodes, and within a device's own node,
the binding can basically do anything sane that it wants.

Hence, this change deprecates the register-compatible property, and
instead uses node names to replace this functionality. This greatly
simplifies the device tree content, making them smaller and more legible.

The code is changed such that old device trees continue to work.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3b26e483

Documentation/devicetree/bindings/regulator/regulator.txt

+4 −1
Original line number Diff line number Diff line
@@ -11,10 +11,13 @@ Optional properties: 
- regulator-boot-on: bootloader/firmware enabled regulator

- <name>-supply: phandle to the parent supply/regulator node

- regulator-ramp-delay: ramp delay for regulator(in uV/uS)



Deprecated properties:

- regulator-compatible: If a regulator chip contains multiple

  regulators, and if the chip's binding contains a child node that

  describes each regulator, then this property indicates which regulator

  this child node is intended to configure.

  this child node is intended to configure. If this property is missing,

  the node's name will be used instead.



Example:

drivers/regulator/of_regulator.c

+12 −13
Original line number Diff line number Diff line
@@ -92,16 +92,18 @@ 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 when node

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

 * of_regulator_match - extract multiple regulator init data from device tree.

 * @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  if

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

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

 * parse regulator init data from the device tree. @node is expected to

 * contain a set of child nodes, each providing the init data for one

 * regulator. The data parsed from a child node will be matched to a regulator

 * based on either the deprecated property regulator-compatible if present,

 * or otherwise the child node's name. Note that the match table is modified

 * in place.

 *

 * Returns the number of matches found or a negative error code on failure.
@@ -112,26 +114,23 @@ int of_regulator_match(struct device *dev, struct device_node *node, 
{

	unsigned int count = 0;

	unsigned int i;

	const char *regulator_comp;

	const char *name;

	struct device_node *child;



	if (!dev || !node)

		return -EINVAL;



	for_each_child_of_node(node, child) {

		regulator_comp = of_get_property(child,

		name = of_get_property(child,

					"regulator-compatible", NULL);

		if (!regulator_comp) {

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

				child->name);

			continue;

		}

		if (!name)

			name = child->name;

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

			struct of_regulator_match *match = &matches[i];

			if (match->of_node)

				continue;



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

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

				continue;



			match->init_data =

CRA Git | Maintained and supported by SUSTech CRA and CCSE