Skip to content

Commit a16d864

Browse files
committed
Merge tag 'staging-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging / IIO driver updates from Greg KH: "Here is the big set of IIO and staging driver patches for 5.14-rc1. Loads of IIO driver updates and additions in here, the shortlog has the full details. For the staging side, we moved a few drivers out of staging, and deleted the kpc2000 drivers as the original developer asked us to because no one was working on them anymore. Also in here are loads of coding style cleanups due to different intern projects focusing on the staging tree to try to get experience doing kernel development. All of these have been in the linux-next tree for a while with no reported problems" * tag 'staging-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (744 commits) staging: hi6421-spmi-pmic: cleanup some macros staging: hi6421-spmi-pmic: change identation of a table staging: hi6421-spmi-pmic: change a return code staging: hi6421-spmi-pmic: better name IRQs staging: hi6421-spmi-pmic: use devm_request_threaded_irq() staging: hisilicon,hi6421-spmi-pmic.yaml: cleanup descriptions spmi: hisi-spmi-controller: move driver from staging phy: phy-hi3670-usb3: move driver from staging into phy staging: rtl8188eu: remove include/rtw_debug.h header staging: rtl8188eu: remove GlobalDebugLevel variable staging: rtl8188eu: remove DRIVER_PREFIX preprocessor definition staging: rtl8188eu: remove RT_TRACE macro staging: rtl8188eu: remove all RT_TRACE calls from hal/rtl8188eu_recv.c staging: rtl8188eu: remove all RT_TRACE calls from hal/hal_intf.c staging: rtl8188eu: remove all RT_TRACE calls from hal/rtl8188eu_xmit.c staging: rtl8188eu: remove all RT_TRACE calls from core/rtw_xmit.c staging: rtl8188eu: remove all RT_TRACE calls from core/rtw_pwrctrl.c staging: rtl8188eu: remove all RT_TRACE calls from core/rtw_recv.c staging: rtl8188eu: remove all RT_TRACE calls from core/rtw_ioctl_set.c staging: rtl8188eu: remove all RT_TRACE calls from core/rtw_ieee80211.c ...
2 parents f5c13f1 + 77ad1f0 commit a16d864

538 files changed

Lines changed: 12918 additions & 19922 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 182 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,182 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/buffer/length
2+
KernelVersion: 2.6.35
3+
Contact: linux-iio@vger.kernel.org
4+
Description:
5+
Number of scans contained by the buffer.
6+
7+
Since Kernel 5.11, multiple buffers are supported.
8+
so, it is better to use, instead:
9+
/sys/bus/iio/devices/iio:deviceX/bufferY/length
10+
11+
What: /sys/bus/iio/devices/iio:deviceX/buffer/enable
12+
KernelVersion: 2.6.35
13+
Contact: linux-iio@vger.kernel.org
14+
Description:
15+
Actually start the buffer capture up. Will start trigger
16+
if first device and appropriate.
17+
18+
Since Kernel 5.11, multiple buffers are supported.
19+
so, it is better to use, instead:
20+
/sys/bus/iio/devices/iio:deviceX/bufferY/enable
21+
22+
What: /sys/bus/iio/devices/iio:deviceX/scan_elements
23+
KernelVersion: 2.6.37
24+
Contact: linux-iio@vger.kernel.org
25+
Description:
26+
Directory containing interfaces for elements that will be
27+
captured for a single triggered sample set in the buffer.
28+
29+
Since kernel 5.11 the scan_elements attributes are merged into
30+
the bufferY directory, to be configurable per buffer.
31+
32+
What: /sys/.../iio:deviceX/scan_elements/in_accel_x_en
33+
What: /sys/.../iio:deviceX/scan_elements/in_accel_y_en
34+
What: /sys/.../iio:deviceX/scan_elements/in_accel_z_en
35+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_x_en
36+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_y_en
37+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_en
38+
What: /sys/.../iio:deviceX/scan_elements/in_magn_x_en
39+
What: /sys/.../iio:deviceX/scan_elements/in_magn_y_en
40+
What: /sys/.../iio:deviceX/scan_elements/in_magn_z_en
41+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_en
42+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_en
43+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_en
44+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_en
45+
What: /sys/.../iio:deviceX/scan_elements/in_timestamp_en
46+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en
47+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_en
48+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY-voltageZ_en
49+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_i_en
50+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_q_en
51+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_i_en
52+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_q_en
53+
What: /sys/.../iio:deviceX/scan_elements/in_incli_x_en
54+
What: /sys/.../iio:deviceX/scan_elements/in_incli_y_en
55+
What: /sys/.../iio:deviceX/scan_elements/in_pressureY_en
56+
What: /sys/.../iio:deviceX/scan_elements/in_pressure_en
57+
What: /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_en
58+
What: /sys/.../iio:deviceX/scan_elements/in_proximity_en
59+
KernelVersion: 2.6.37
60+
Contact: linux-iio@vger.kernel.org
61+
Description:
62+
Scan element control for triggered data capture.
63+
64+
Since kernel 5.11 the scan_elements attributes are merged into
65+
the bufferY directory, to be configurable per buffer.
66+
67+
What: /sys/.../iio:deviceX/scan_elements/in_accel_type
68+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_type
69+
What: /sys/.../iio:deviceX/scan_elements/in_magn_type
70+
What: /sys/.../iio:deviceX/scan_elements/in_incli_type
71+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_type
72+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_type
73+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_type
74+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_i_type
75+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_q_type
76+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_i_type
77+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_q_type
78+
What: /sys/.../iio:deviceX/scan_elements/in_timestamp_type
79+
What: /sys/.../iio:deviceX/scan_elements/in_pressureY_type
80+
What: /sys/.../iio:deviceX/scan_elements/in_pressure_type
81+
What: /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_type
82+
What: /sys/.../iio:deviceX/scan_elements/in_proximity_type
83+
KernelVersion: 2.6.37
84+
Contact: linux-iio@vger.kernel.org
85+
Description:
86+
Description of the scan element data storage within the buffer
87+
and hence the form in which it is read from user-space.
88+
Form is [be|le]:[s|u]bits/storagebits[>>shift].
89+
be or le specifies big or little endian. s or u specifies if
90+
signed (2's complement) or unsigned. bits is the number of bits
91+
of data and storagebits is the space (after padding) that it
92+
occupies in the buffer. shift if specified, is the shift that
93+
needs to be applied prior to masking out unused bits. Some
94+
devices put their data in the middle of the transferred elements
95+
with additional information on both sides. Note that some
96+
devices will have additional information in the unused bits
97+
so to get a clean value, the bits value must be used to mask
98+
the buffer output value appropriately. The storagebits value
99+
also specifies the data alignment. So s48/64>>2 will be a
100+
signed 48 bit integer stored in a 64 bit location aligned to
101+
a 64 bit boundary. To obtain the clean value, shift right 2
102+
and apply a mask to zero the top 16 bits of the result.
103+
For other storage combinations this attribute will be extended
104+
appropriately.
105+
106+
Since kernel 5.11 the scan_elements attributes are merged into
107+
the bufferY directory, to be configurable per buffer.
108+
109+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_index
110+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_index
111+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_i_index
112+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_q_index
113+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_i_index
114+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_q_index
115+
What: /sys/.../iio:deviceX/scan_elements/in_accel_x_index
116+
What: /sys/.../iio:deviceX/scan_elements/in_accel_y_index
117+
What: /sys/.../iio:deviceX/scan_elements/in_accel_z_index
118+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_x_index
119+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_y_index
120+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_index
121+
What: /sys/.../iio:deviceX/scan_elements/in_magn_x_index
122+
What: /sys/.../iio:deviceX/scan_elements/in_magn_y_index
123+
What: /sys/.../iio:deviceX/scan_elements/in_magn_z_index
124+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_index
125+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_index
126+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_index
127+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_index
128+
What: /sys/.../iio:deviceX/scan_elements/in_incli_x_index
129+
What: /sys/.../iio:deviceX/scan_elements/in_incli_y_index
130+
What: /sys/.../iio:deviceX/scan_elements/in_timestamp_index
131+
What: /sys/.../iio:deviceX/scan_elements/in_pressureY_index
132+
What: /sys/.../iio:deviceX/scan_elements/in_pressure_index
133+
What: /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_index
134+
What: /sys/.../iio:deviceX/scan_elements/in_proximity_index
135+
KernelVersion: 2.6.37
136+
Description:
137+
A single positive integer specifying the position of this
138+
scan element in the buffer. Note these are not dependent on
139+
what is enabled and may not be contiguous. Thus for user-space
140+
to establish the full layout these must be used in conjunction
141+
with all _en attributes to establish which channels are present,
142+
and the relevant _type attributes to establish the data storage
143+
format.
144+
145+
Since kernel 5.11 the scan_elements attributes are merged into
146+
the bufferY directory, to be configurable per buffer.
147+
148+
What: /sys/bus/iio/devices/iio:deviceX/buffer/watermark
149+
KernelVersion: 4.2
150+
Contact: linux-iio@vger.kernel.org
151+
Description:
152+
A single positive integer specifying the maximum number of scan
153+
elements to wait for.
154+
155+
Poll will block until the watermark is reached.
156+
157+
Blocking read will wait until the minimum between the requested
158+
read amount or the low water mark is available.
159+
160+
Non-blocking read will retrieve the available samples from the
161+
buffer even if there are less samples then watermark level. This
162+
allows the application to block on poll with a timeout and read
163+
the available samples after the timeout expires and thus have a
164+
maximum delay guarantee.
165+
166+
Since Kernel 5.11, multiple buffers are supported.
167+
so, it is better to use, instead:
168+
/sys/bus/iio/devices/iio:deviceX/bufferY/watermark
169+
170+
What: /sys/bus/iio/devices/iio:deviceX/buffer/data_available
171+
KernelVersion: 4.16
172+
Contact: linux-iio@vger.kernel.org
173+
Description:
174+
A read-only value indicating the bytes of data available in the
175+
buffer. In the case of an output buffer, this indicates the
176+
amount of empty space available to write data to. In the case of
177+
an input buffer, this indicates the amount of data available for
178+
reading.
179+
180+
Since Kernel 5.11, multiple buffers are supported.
181+
so, it is better to use, instead:
182+
/sys/bus/iio/devices/iio:deviceX/bufferY/data_available

Documentation/ABI/testing/sysfs-bus-counter

Lines changed: 83 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ Description:
5757
What: /sys/bus/counter/devices/counterX/countY/count_mode_available
5858
What: /sys/bus/counter/devices/counterX/countY/error_noise_available
5959
What: /sys/bus/counter/devices/counterX/countY/function_available
60+
What: /sys/bus/counter/devices/counterX/countY/prescaler_available
6061
What: /sys/bus/counter/devices/counterX/countY/signalZ_action_available
6162
KernelVersion: 5.2
6263
Contact: linux-iio@vger.kernel.org
@@ -154,6 +155,15 @@ Description:
154155
Count Y. If possible, this should match the name of the
155156
respective channel as it appears in the device datasheet.
156157

158+
What: /sys/bus/counter/devices/counterX/countY/prescaler
159+
KernelVersion: 5.2
160+
Contact: linux-iio@vger.kernel.org
161+
Description:
162+
Configure the prescaler value associated with Count Y.
163+
On the FlexTimer, the counter clock source passes through a
164+
prescaler (i.e. a counter). This acts like a clock
165+
divider.
166+
157167
What: /sys/bus/counter/devices/counterX/countY/preset
158168
KernelVersion: 5.2
159169
Contact: linux-iio@vger.kernel.org
@@ -193,6 +203,15 @@ Description:
193203
both edges:
194204
Any state transition.
195205

206+
What: /sys/bus/counter/devices/counterX/countY/spike_filter_ns
207+
KernelVersion: 5.14
208+
Contact: linux-iio@vger.kernel.org
209+
Description:
210+
If the counter device supports programmable spike filter this
211+
attribute indicates the value in nanoseconds where noise pulses
212+
shorter or equal to configured value are ignored. Value 0 means
213+
filter is disabled.
214+
196215
What: /sys/bus/counter/devices/counterX/name
197216
KernelVersion: 5.2
198217
Contact: linux-iio@vger.kernel.org
@@ -215,11 +234,45 @@ Description:
215234
Read-only attribute that indicates the total number of Signals
216235
belonging to the Counter.
217236

218-
What: /sys/bus/counter/devices/counterX/signalY/signal
237+
What: /sys/bus/counter/devices/counterX/signalY/cable_fault
238+
KernelVersion: 5.7
239+
Contact: linux-iio@vger.kernel.org
240+
Description:
241+
Read-only attribute that indicates whether a differential
242+
encoder cable fault (not connected or loose wires) is detected
243+
for the respective channel of Signal Y. Valid attribute values
244+
are boolean. Detection must first be enabled via the
245+
corresponding cable_fault_enable attribute.
246+
247+
What: /sys/bus/counter/devices/counterX/signalY/cable_fault_enable
248+
KernelVersion: 5.7
249+
Contact: linux-iio@vger.kernel.org
250+
Description:
251+
Whether detection of differential encoder cable faults for the
252+
respective channel of Signal Y is enabled. Valid attribute
253+
values are boolean.
254+
255+
What: /sys/bus/counter/devices/counterX/signalY/filter_clock_prescaler
256+
KernelVersion: 5.7
257+
Contact: linux-iio@vger.kernel.org
258+
Description:
259+
Filter clock factor for input Signal Y. This prescaler value
260+
affects the inputs of both quadrature pair signals.
261+
262+
What: /sys/bus/counter/devices/counterX/signalY/index_polarity
219263
KernelVersion: 5.2
220264
Contact: linux-iio@vger.kernel.org
221265
Description:
222-
Signal data of Signal Y represented as a string.
266+
Active level of index input Signal Y; irrelevant in
267+
non-synchronous load mode.
268+
269+
What: /sys/bus/counter/devices/counterX/signalY/index_polarity_available
270+
What: /sys/bus/counter/devices/counterX/signalY/synchronous_mode_available
271+
KernelVersion: 5.2
272+
Contact: linux-iio@vger.kernel.org
273+
Description:
274+
Discrete set of available values for the respective Signal Y
275+
configuration are listed in this file.
223276

224277
What: /sys/bus/counter/devices/counterX/signalY/name
225278
KernelVersion: 5.2
@@ -228,3 +281,31 @@ Description:
228281
Read-only attribute that indicates the device-specific name of
229282
Signal Y. If possible, this should match the name of the
230283
respective signal as it appears in the device datasheet.
284+
285+
What: /sys/bus/counter/devices/counterX/signalY/signal
286+
KernelVersion: 5.2
287+
Contact: linux-iio@vger.kernel.org
288+
Description:
289+
Signal data of Signal Y represented as a string.
290+
291+
What: /sys/bus/counter/devices/counterX/signalY/synchronous_mode
292+
KernelVersion: 5.2
293+
Contact: linux-iio@vger.kernel.org
294+
Description:
295+
Configure the counter associated with Signal Y for
296+
non-synchronous or synchronous load mode. Synchronous load mode
297+
cannot be selected in non-quadrature (Pulse-Direction) clock
298+
mode.
299+
300+
non-synchronous:
301+
A logic low level is the active level at this index
302+
input. The index function (as enabled via preset_enable)
303+
is performed directly on the active level of the index
304+
input.
305+
306+
synchronous:
307+
Intended for interfacing with encoder Index output in
308+
quadrature clock mode. The active level is configured
309+
via index_polarity. The index function (as enabled via
310+
preset_enable) is performed synchronously with the
311+
quadrature clock on the active level of the index input.

Documentation/ABI/testing/sysfs-bus-counter-104-quad-8

Lines changed: 0 additions & 61 deletions
This file was deleted.

Documentation/ABI/testing/sysfs-bus-counter-ftm-quaddec

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)