Merge tag 'for-linus' of git://github.com/openrisc/linux

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / mfd / as3722.txt

diff --git a/Documentation/devicetree/bindings/mfd/as3722.txt b/Documentation/devicetree/bindings/mfd/as3722.txt
index 5297b22107040046a2bf6ddf1213941a3ddc15f8..2a665741d7fe20e8089feb38767066d9bda7b0fc 100644 (file)
--- a/Documentation/devicetree/bindings/mfd/as3722.txt
+++ b/Documentation/devicetree/bindings/mfd/as3722.txt
@@ -20,6 +20,8 @@ Optional properties:
 - ams,enable-internal-i2c-pullup: Boolean property, to enable internal pullup on
        i2c scl/sda pins. Missing this will disable internal pullup on i2c
        scl/sda lines.
+- ams,enable-ac-ok-power-on: Boolean property, to enable exit out of power off
+       mode with AC_OK pin (pin enabled in power off mode).
 
 Optional submodule and their properties:
 =======================================