diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt index 53931649e4d5..653a1237c721 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.txt +++ b/Documentation/devicetree/bindings/regulator/regulator.txt @@ -5,8 +5,9 @@ Optional properties: - regulator-min-microvolt: smallest voltage consumers may set - regulator-max-microvolt: largest voltage consumers may set - regulator-microvolt-offset: Offset applied to voltages to compensate for voltage drops -- regulator-early-min-microvolt: minimum voltage during system startup, make sure we - select a voltage that suits the needs of all regulator consumers +- regulator-init-microvolt: Set by bootloader or when initialising, in order to + make sure the voltage can suit the needs of all regulator consumers during + system startup. - regulator-min-microamp: smallest current consumers may set - regulator-max-microamp: largest current consumers may set - regulator-input-current-limit-microamp: maximum input current regulator allows diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 01060076dd78..3e829496ba81 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -42,7 +42,7 @@ static void of_get_regulation_constraints(struct device_node *np, if (!of_property_read_u32(np, "regulator-max-microvolt", &pval)) constraints->max_uV = pval; - if (!of_property_read_u32(np, "regulator-early-min-microvolt", &pval)) + if (!of_property_read_u32(np, "regulator-init-microvolt", &pval)) constraints->early_min_uV = pval; /* Voltage change possible? */