Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[~andy/linux] / Documentation / ABI / testing / sysfs-bus-iio

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index dda81ffae5cfb4b385eaf89c799f888268ce7148..39c8de0e53d00924630c789e27c9e6c10af5e960 100644 (file)
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -351,6 +351,7 @@ Description:
                6kohm_to_gnd: connected to ground via a 6kOhm resistor,
                20kohm_to_gnd: connected to ground via a 20kOhm resistor,
                100kohm_to_gnd: connected to ground via an 100kOhm resistor,
+               500kohm_to_gnd: connected to ground via a 500kOhm resistor,
                three_state: left floating.
                For a list of available output power down options read
                outX_powerdown_mode_available. If Y is not present the
@@ -792,3 +793,21 @@ Contact:   linux-iio@vger.kernel.org
 Description:
                This attribute is used to read the amount of quadrature error
                present in the device at a given time.
+
+What:          /sys/.../iio:deviceX/in_accelX_power_mode
+KernelVersion: 3.11
+Contact:       linux-iio@vger.kernel.org
+Description:
+               Specifies the chip power mode.
+               low_noise: reduce noise level from ADC,
+               low_power: enable low current consumption.
+               For a list of available output power modes read
+               in_accel_power_mode_available.
+
+What:          /sys/bus/iio/devices/iio:deviceX/store_eeprom
+KernelVersion: 3.4.0
+Contact:       linux-iio@vger.kernel.org
+Description:
+               Writing '1' stores the current device configuration into
+               on-chip EEPROM. After power-up or chip reset the device will
+               automatically load the saved configuration.