Since regulator-boot-on property maps back to constraints->boot_on, current description of 'regulator-boot-on' property conflicts with description of 'boot-on' in include/linux/regulator/machine.h and the corresponding implementation in drivers/regulator/core.c. Ensure the description is more inline with the original intent. Cc: Rajendra Nayak <rnayak@xxxxxx> Reported-by: Kishon Vijay Abraham I <kishon@xxxxxx> Signed-off-by: Nishanth Menon <nm@xxxxxx> --- Ref: my confusion in http://marc.info/?t=138140228800004&r=1&w=2 Based on v3.12-rc4 tag .../devicetree/bindings/regulator/regulator.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt index 2bd8f09..d999f096 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.txt +++ b/Documentation/devicetree/bindings/regulator/regulator.txt @@ -8,7 +8,9 @@ Optional properties: - regulator-min-microamp: smallest current consumers may set - regulator-max-microamp: largest current consumers may set - regulator-always-on: boolean, regulator should never be disabled -- regulator-boot-on: bootloader/firmware enabled regulator +- regulator-boot-on: regulator is enabled when the system is initially started. + If the regulator is not enabled by the hardware or bootloader then it will be + enabled when the constraints are applied. - regulator-allow-bypass: allow the regulator to go into bypass mode - <name>-supply: phandle to the parent supply/regulator node - regulator-ramp-delay: ramp delay for regulator(in uV/uS) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
