Commit 007fe232 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v7.0-rc4' of... 

Merge tag 'regulator-fix-v7.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown:
 "Just one fix here from Hugo Villeneuve, the documentation for some of
  the regulator DT properties had been cut'n'pasted so that if anyone
  actually read it they'd be informed that those properties had
  completely incorrect meanings"

* tag 'regulator-fix-v7.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: dt-bindings: fix typos in regulator-uv-* descriptions
parents c715f13b 4221f30e

Documentation/devicetree/bindings/regulator/regulator.yaml

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ properties: 
      offset from voltage set to regulator.



  regulator-uv-protection-microvolt:

    description: Set over under voltage protection limit. This is a limit where

    description: Set under voltage protection limit. This is a limit where

      hardware performs emergency shutdown. Zero can be passed to disable

      protection and value '1' indicates that protection should be enabled but

      limit setting can be omitted. Limit is given as microvolt offset from
@@ -182,7 +182,7 @@ properties: 
      is given as microvolt offset from voltage set to regulator.



  regulator-uv-warn-microvolt:

    description: Set over under voltage warning limit. This is a limit where

    description: Set under voltage warning limit. This is a limit where

      hardware is assumed still to be functional but approaching limit where

      it gets damaged. Recovery actions should be initiated. Zero can be passed

      to disable detection and value '1' indicates that detection should