diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-04 11:55:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-04 11:55:21 -0700 |
commit | d62eb5edf6643ede7e48b4d03ba972c0e8949acc (patch) | |
tree | aeee580b787976558eb6c67173a42b77168d3e7a /Documentation | |
parent | 36b8042262e7fbabf62ab300361399bec6499b6f (diff) | |
parent | 8d67f64f7739464c352d4b167ed1748f3b2c1f44 (diff) | |
download | linux-d62eb5edf6643ede7e48b4d03ba972c0e8949acc.tar.bz2 |
Merge tag 'regulator-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown:
"A quiet release for the regulator API, a series of fairly small fixes
plus one new feature and a few new drivers:
- Support for regulators with different settling times for rising and
falling voltage changes.
- New drivers for Allwinner AXP803, HiSilicon HI6421V530 and TI
LP87565"
* tag 'regulator-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (21 commits)
regulator: core: Fix size limit of supply_map
regulator: core: Fix voltage change propagations to supply regulators
regulator: lp87565: Fix the initial voltage range
regulator: tps65910: wire up sleep control configuration
regulator: hi6421v530: Describe consumed platform device
regulator: tps65910: check TPS65910_NUM_REGS at build time
regulator: core: Prioritise consumer mappings over regulator name
regulator: lp87565: Fix the GPL header
regulator: hi6421: Describe consumed platform device
regulator: hi6421v530: add driver for hi6421v530 voltage regulator
regulator: da9061: BUCK and LDO regulator driver
regulator: bd9571mwv: Statize local symbols
regulator: tps65917: Add support for SMPS12
regulator: lp87565: Add support for lp87565 PMIC regulators
regulator: axp20x-regulator: add support for AXP803
regulator: lp8755: fix spelling mistake "acceess" -> "access"
regulator: Allow for asymmetric settling times
regulator: DT: Add properties for asymmetric settling times
regulator: palmas: Drop unnecessary static
MAINTAINERS: Update MAX77802 PMIC entry
...
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/mfd/tps65910.txt | 4 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/regulator/regulator.txt | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mfd/tps65910.txt b/Documentation/devicetree/bindings/mfd/tps65910.txt index 38833e63a59f..8af1202b381d 100644 --- a/Documentation/devicetree/bindings/mfd/tps65910.txt +++ b/Documentation/devicetree/bindings/mfd/tps65910.txt @@ -61,6 +61,10 @@ Optional properties: There should be 9 entries here, one for each gpio. - ti,system-power-controller: Telling whether or not this pmic is controlling the system power. +- ti,sleep-enable: Enable SLEEP state. +- ti,sleep-keep-therm: Keep thermal monitoring on in sleep state. +- ti,sleep-keep-ck32k: Keep the 32KHz clock output on in sleep state. +- ti,sleep-keep-hsclk: Keep high speed internal clock on in sleep state. Regulator Optional properties: - ti,regulator-ext-sleep-control: enable external sleep diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt index d18edb075e1c..378f6dc8b8bd 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.txt +++ b/Documentation/devicetree/bindings/regulator/regulator.txt @@ -24,6 +24,14 @@ Optional properties: - regulator-settling-time-us: Settling time, in microseconds, for voltage change if regulator have the constant time for any level voltage change. This is useful when regulator have exponential voltage change. +- regulator-settling-time-up-us: Settling time, in microseconds, for voltage + increase if the regulator needs a constant time to settle after voltage + increases of any level. This is useful for regulators with exponential + voltage changes. +- regulator-settling-time-down-us: Settling time, in microseconds, for voltage + decrease if the regulator needs a constant time to settle after voltage + decreases of any level. This is useful for regulators with exponential + voltage changes. - regulator-soft-start: Enable soft start so that voltage ramps slowly - regulator-state-mem sub-root node for Suspend-to-RAM mode : suspend to memory, the device goes to sleep, but all data stored in memory, |