Merge tag 'staging-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging/IIO updates from Greg KH: "Here's the large set of staging and iio driver patches for 4.13-rc1. After over 500 patches, we removed about 200 more lines of code than we added, not great, but we added some new IIO drivers for unsupported hardware, so it's an overall win. Also here are lots of small fixes, and some tty core api additions (with the tty maintainer's ack) for the speakup drivers, those are finally getting some much needed cleanups and are looking much better now than before. Full details in the shortlog. All of these have been in linux-next for a while with no reported issues" * tag 'staging-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (529 commits) staging: lustre: replace kmalloc with kmalloc_array Staging: ion: fix code style warning from NULL comparisons staging: fsl-mc: make dprc.h header private staging: fsl-mc: move mc-cmd.h contents in the public header staging: fsl-mc: move mc-sys.h contents in the public header staging: fsl-mc: fix a few implicit includes staging: fsl-mc: remove dpmng API files staging: fsl-mc: move rest of mc-bus.h to private header staging: fsl-mc: move couple of definitions to public header staging: fsl-mc: move irq domain creation prototype to public header staging: fsl-mc: turn several exported functions static staging: fsl-mc: delete prototype of unimplemented function staging: fsl-mc: delete duplicated function prototypes staging: fsl-mc: decouple the mc-bus public headers from dprc.h staging: fsl-mc: drop useless #includes staging: fsl-mc: be consistent when checking strcmp() return staging: fsl-mc: move comparison before strcmp() call staging: speakup: make function ser_to_dev static staging: ks7010: fix spelling mistake: "errror" -> "error" staging: rtl8192e: fix spelling mistake: "respose" -> "response" ...
This commit is contained in:
Linus Torvalds
@ -1425,6 +1425,17 @@ Description:
|
||||
guarantees that the hardware fifo is flushed to the device
|
||||
buffer.
|
||||
|
||||
What: /sys/bus/iio/devices/iio:device*/buffer/hwfifo_timeout
|
||||
KernelVersion: 4.12
|
||||
Contact: linux-iio@vger.kernel.org
|
||||
Description:
|
||||
A read/write property to provide capability to delay reporting of
|
||||
samples till a timeout is reached. This allows host processors to
|
||||
sleep, while the sensor is storing samples in its internal fifo.
|
||||
The maximum timeout in seconds can be specified by setting
|
||||
hwfifo_timeout.The current delay can be read by reading
|
||||
hwfifo_timeout. A value of 0 means that there is no timeout.
|
||||
|
||||
What: /sys/bus/iio/devices/iio:deviceX/buffer/hwfifo_watermark
|
||||
KernelVersion: 4.2
|
||||
Contact: linux-iio@vger.kernel.org
|
||||
|
||||
@ -5,4 +5,3 @@ Description:
|
||||
Reading returns either '1' or '0'. '1' means that the
|
||||
battery level supplied to sensor is below 2.25V.
|
||||
This ABI is available for tsys02d, htu21, ms8607
|
||||
This ABI is available for htu21, ms8607
|
||||
|
||||
@ -16,6 +16,54 @@ Description:
|
||||
- "OC2REF" : OC2REF signal is used as trigger output.
|
||||
- "OC3REF" : OC3REF signal is used as trigger output.
|
||||
- "OC4REF" : OC4REF signal is used as trigger output.
|
||||
Additional modes (on TRGO2 only):
|
||||
- "OC5REF" : OC5REF signal is used as trigger output.
|
||||
- "OC6REF" : OC6REF signal is used as trigger output.
|
||||
- "compare_pulse_OC4REF":
|
||||
OC4REF rising or falling edges generate pulses.
|
||||
- "compare_pulse_OC6REF":
|
||||
OC6REF rising or falling edges generate pulses.
|
||||
- "compare_pulse_OC4REF_r_or_OC6REF_r":
|
||||
OC4REF or OC6REF rising edges generate pulses.
|
||||
- "compare_pulse_OC4REF_r_or_OC6REF_f":
|
||||
OC4REF rising or OC6REF falling edges generate pulses.
|
||||
- "compare_pulse_OC5REF_r_or_OC6REF_r":
|
||||
OC5REF or OC6REF rising edges generate pulses.
|
||||
- "compare_pulse_OC5REF_r_or_OC6REF_f":
|
||||
OC5REF rising or OC6REF falling edges generate pulses.
|
||||
|
||||
+-----------+ +-------------+ +---------+
|
||||
| Prescaler +-> | Counter | +-> | Master | TRGO(2)
|
||||
+-----------+ +--+--------+-+ |-> | Control +-->
|
||||
| | || +---------+
|
||||
+--v--------+-+ OCxREF || +---------+
|
||||
| Chx compare +----------> | Output | ChX
|
||||
+-----------+-+ | | Control +-->
|
||||
. | | +---------+
|
||||
. | | .
|
||||
+-----------v-+ OC6REF | .
|
||||
| Ch6 compare +---------+>
|
||||
+-------------+
|
||||
|
||||
Example with: "compare_pulse_OC4REF_r_or_OC6REF_r":
|
||||
|
||||
X
|
||||
X X
|
||||
X . . X
|
||||
X . . X
|
||||
X . . X
|
||||
count X . . . . X
|
||||
. . . .
|
||||
. . . .
|
||||
+---------------+
|
||||
OC4REF | . . |
|
||||
+-+ . . +-+
|
||||
. +---+ .
|
||||
OC6REF . | | .
|
||||
+-------+ +-------+
|
||||
+-+ +-+
|
||||
TRGO2 | | | |
|
||||
+-+ +---+ +---------+
|
||||
|
||||
What: /sys/bus/iio/devices/triggerX/master_mode
|
||||
KernelVersion: 4.11
|
||||
@ -90,3 +138,18 @@ Description:
|
||||
Counting is enabled on rising edge of the connected
|
||||
trigger, and remains enabled for the duration of this
|
||||
selected mode.
|
||||
|
||||
What: /sys/bus/iio/devices/iio:deviceX/in_count_trigger_mode_available
|
||||
KernelVersion: 4.13
|
||||
Contact: benjamin.gaignard@st.com
|
||||
Description:
|
||||
Reading returns the list possible trigger modes.
|
||||
|
||||
What: /sys/bus/iio/devices/iio:deviceX/in_count0_trigger_mode
|
||||
KernelVersion: 4.13
|
||||
Contact: benjamin.gaignard@st.com
|
||||
Description:
|
||||
Configure the device counter trigger mode
|
||||
counting direction is set by in_count0_count_direction
|
||||
attribute and the counter is clocked by the connected trigger
|
||||
rising edges.
|
||||
|
||||
Reference in New Issue
Block a user