diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-06 23:48:30 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-06 23:48:30 +0300 |
commit | 43c63729c96f06f97367edf680d42d634041fd6a (patch) | |
tree | b2506b8802b63f83078175262211d56fc992ec3b /Documentation | |
parent | 08e39fcb92b039189006566a97aa9565fe20fb83 (diff) | |
parent | 02fbabd5f4ed182d2c616e49309f5a3efd9ec671 (diff) | |
download | linux-43c63729c96f06f97367edf680d42d634041fd6a.tar.xz |
Merge tag 'regulator-fix-v5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"A couple of small fixes, one for a minor issue in the stm32-vrefbuf
driver and a documentation fix in the Qualcomm code"
* tag 'regulator-fix-v5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: stm32-vrefbuf: fix a possible overshoot when re-enabling
regulator: qcom_spmi: Fix docs for PM8004
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt b/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt index f5cdac8b2847..8b005192f6e8 100644 --- a/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt @@ -161,7 +161,7 @@ The regulator node houses sub-nodes for each regulator within the device. Each sub-node is identified using the node's name, with valid values listed for each of the PMICs below. -pm8005: +pm8004: s2, s5 pm8005: |