diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-13 13:13:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-13 13:13:36 -0500 |
commit | 39272dde8ffcfd1322209e05f3f8fa4d14f796de (patch) | |
tree | 1c06907119d0ae484319379ec4404edf95ac37b5 /Documentation/ABI | |
parent | 67ad058d97b8cff441211b791d97e5f776b81210 (diff) | |
parent | 841e3ed977e0284e3680d6345d880a64e8072573 (diff) |
Merge tag 'staging-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH:
"Here is the big staging driver pull request for 4.5-rc1.
Lots of cleanups and fixes here, not as many as some releases, but
800+ isn't that bad. Full details in the shortlog. All of these have
been in linux-next for a while"
* tag 'staging-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (843 commits)
Revert "arm64: dts: Add dts files to enable ION on Hi6220 SoC."
staging: gdm724x: constify tty_port_operations structs
staging: gdm72xx: add userspace data struct
staging: gdm72xx: Replace timeval with ktime_t
iio: adc: ina2xx: Fix incorrect report of data endianness to userspace.
iio: light: us5182d: Refactor read_raw function
iio: light: us5182d: Add interrupt support and events
iio: light: us5182d: Fix enable status inconcistency
iio: Make IIO value formating function globally available.
staging: emxx_udc: use list_first_entry_or_null()
staging/emxx_udc: fix 64-bit warnings
STAGING: COMEDI: Using kernel types in plx9080.h
STAGING: COMEDI: Added spaces around binary operators in plx9080.h
STAGING: COMEDI: Fixed format of comments in plx9080.h
staging: comedi: comedilib.h: Coding style warning fix for block comments
staging: comedi: s526: add macros for counter control reg values
staging: comedi: s526: replace counter mode bitfield struct
staging: comedi: check for more errors for zero-length write
staging: comedi: simplify returned errors for comedi_write()
staging: comedi: return error on "write" if no command set up
...
Diffstat (limited to 'Documentation/ABI')
-rw-r--r-- | Documentation/ABI/testing/configfs-iio | 21 | ||||
-rw-r--r-- | Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc | 24 |
2 files changed, 45 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/configfs-iio b/Documentation/ABI/testing/configfs-iio new file mode 100644 index 000000000000..2483756fccf5 --- /dev/null +++ b/Documentation/ABI/testing/configfs-iio | |||
@@ -0,0 +1,21 @@ | |||
1 | What: /config/iio | ||
2 | Date: October 2015 | ||
3 | KernelVersion: 4.4 | ||
4 | Contact: linux-iio@vger.kernel.org | ||
5 | Description: | ||
6 | This represents Industrial IO configuration entry point | ||
7 | directory. It contains sub-groups corresponding to IIO | ||
8 | objects. | ||
9 | |||
10 | What: /config/iio/triggers | ||
11 | Date: October 2015 | ||
12 | KernelVersion: 4.4 | ||
13 | Description: | ||
14 | Industrial IO software triggers directory. | ||
15 | |||
16 | What: /config/iio/triggers/hrtimers | ||
17 | Date: October 2015 | ||
18 | KernelVersion: 4.4 | ||
19 | Description: | ||
20 | High resolution timers directory. Creating a directory here | ||
21 | will result in creating a hrtimer trigger in the IIO subsystem. | ||
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc b/Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc new file mode 100644 index 000000000000..8916f7ec6507 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc | |||
@@ -0,0 +1,24 @@ | |||
1 | What: /sys/bus/iio/devices/iio:deviceX/in_allow_async_readout | ||
2 | Date: December 2015 | ||
3 | KernelVersion: 4.4 | ||
4 | Contact: linux-iio@vger.kernel.org | ||
5 | Description: | ||
6 | By default (value '0'), the capture thread checks for the Conversion | ||
7 | Ready Flag to being set prior to committing a new value to the sample | ||
8 | buffer. This synchronizes the in-chip conversion rate with the | ||
9 | in-driver readout rate at the cost of an additional register read. | ||
10 | |||
11 | Writing '1' will remove the polling for the Conversion Ready Flags to | ||
12 | save the additional i2c transaction, which will improve the bandwidth | ||
13 | available for reading data. However, samples can be occasionally skipped | ||
14 | or repeated, depending on the beat between the capture and conversion | ||
15 | rates. | ||
16 | |||
17 | What: /sys/bus/iio/devices/iio:deviceX/in_shunt_resistor | ||
18 | Date: December 2015 | ||
19 | KernelVersion: 4.4 | ||
20 | Contact: linux-iio@vger.kernel.org | ||
21 | Description: | ||
22 | The value of the shunt resistor may be known only at runtime fom an | ||
23 | eeprom content read by a client application. This attribute allows to | ||
24 | set its value in ohms. | ||