Message ID | 1516708783-6288-1-git-send-email-zhang.chunyan@linaro.org |
---|---|
State | Accepted |
Commit | 057c76440c791eb31eb68f3b003f67d00fcce51a |
Headers | show |
Series | [V4,1/5] bindings: regulator: added support for suspend states | expand |
On Tue, Jan 23, 2018 at 07:59:40PM +0800, Chunyan Zhang wrote: > Some regulator consumers would like to make the regulator device > keeping a voltage range output when the system entering into > suspend states. I tried to apply these but there's earlier versions of some of them already applied on my topic/suspend branch so it's just a world of conflicts - can you please rebase against that branch (or my for-next)? Please don't resubmit patches that have already been applied, you should submit patches against current code in the tree you're expecting things to be applied to. If any updates are needed to a patch that's already been applied you should submit incremental patches which make those updates. This avoids having to change published git commits which could cause problems for people working against git.
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt index 378f6dc..e459226 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.txt +++ b/Documentation/devicetree/bindings/regulator/regulator.txt @@ -42,8 +42,16 @@ Optional properties: - regulator-state-[mem/disk] node has following common properties: - regulator-on-in-suspend: regulator should be on in suspend state. - regulator-off-in-suspend: regulator should be off in suspend state. - - regulator-suspend-microvolt: regulator should be set to this voltage - in suspend. + - regulator-suspend-min-microvolt: minimum voltage may be set in + suspend state. + - regulator-suspend-max-microvolt: maximum voltage may be set in + suspend state. + - regulator-suspend-microvolt: the default voltage which regulator + would be set in suspend. This property is now deprecated, instead + setting voltage for suspend mode via the API which regulator + driver provides is recommended. + - regulator-changeable-in-suspend: whether the default voltage and + the regulator on/off in suspend can be changed in runtime. - regulator-mode: operating mode in the given suspend state. The set of possible operating modes depends on the capabilities of every hardware so the valid modes are documented on each regulator