Commit 84e4526f authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regulator-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator DT binding fixes from Mark Brown:
 "A couple of fixes to bring the DT binding documentation for Palmas
  into sync with the code"

* tag 'regulator-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: palmas-pmic: doc: remove ti,tstep
  regulator: palmas-pmic: doc: fix typo for sleep-mode
parents d56290bb 386c90ac
...@@ -31,9 +31,8 @@ Optional nodes: ...@@ -31,9 +31,8 @@ Optional nodes:
Optional sub-node properties: Optional sub-node properties:
ti,warm-reset - maintain voltage during warm reset(boolean) ti,warm-reset - maintain voltage during warm reset(boolean)
ti,roof-floor - control voltage selection by pin(boolean) ti,roof-floor - control voltage selection by pin(boolean)
ti,sleep-mode - mode to adopt in pmic sleep 0 - off, 1 - auto, ti,mode-sleep - mode to adopt in pmic sleep 0 - off, 1 - auto,
2 - eco, 3 - forced pwm 2 - eco, 3 - forced pwm
ti,tstep - slope control 0 - Jump, 1 10mV/us, 2 5mV/us, 3 2.5mV/us
ti,smps-range - OTP has the wrong range set for the hardware so override ti,smps-range - OTP has the wrong range set for the hardware so override
0 - low range, 1 - high range. 0 - low range, 1 - high range.
...@@ -59,7 +58,6 @@ pmic { ...@@ -59,7 +58,6 @@ pmic {
ti,warm-reset; ti,warm-reset;
ti,roof-floor; ti,roof-floor;
ti,mode-sleep = <0>; ti,mode-sleep = <0>;
ti,tstep = <0>;
ti,smps-range = <1>; ti,smps-range = <1>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment