Skip to content

Commit ade7afe

Browse files
committed
Merge tag 'staging-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging / IIO driver updates from Greg KH: "Here is the large set of staging and IIO driver updates for 5.10-rc1. Included in here are: - new IIO drivers - new IIO driver frameworks - various IIO driver fixes and updates - IIO device tree conversions to yaml - so many minor staging driver coding style cleanups - most cdev driver moved out of staging - no staging drivers added or removed Full details are in the shortlog. All of these have been in linux-next for a while with no reported issues" * tag 'staging-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (476 commits) staging: comedi: check validity of wMaxPacketSize of usb endpoints found staging: wfx: improve robustness of wfx_get_hw_rate() staging: wfx: drop unicode characters from strings staging: wfx: gpiod_get_value() can return an error staging: wfx: increase robustness of hif_generic_confirm() staging: wfx: wfx_init_common() returns NULL on error staging: wfx: standardize the error when vif does not exist staging: wfx: check memory allocation staging: wfx: improve error handling of hif_join() staging: dpaa2-switch: add a dpaa2_switch prefix to all functions in ethsw.c staging: dpaa2-switch: add a dpaa2_switch_ prefix to all functions in ethsw-ethtool.c staging: rtl8188eu: Fix long lines dt-bindings: staging: wfx: silabs,wfx yaml conversion staging: wfx: update copyrights dates staging: wfx: fix QoS priority for slow buses staging: wfx: fix BA sessions for older firmwares staging: wfx: remove remaining code of 'secure link' feature staging: wfx: fix handling of MMIC error staging: vchiq: Fix list_for_each exit tests staging: greybus: use __force when assigning __u8 value to snd_ctl_elem_type_t ...
2 parents 3e4fb43 + e1f13c8 commit ade7afe

File tree

436 files changed

+11422
-7211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

436 files changed

+11422
-7211
lines changed

CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1942,6 +1942,10 @@ S: Post Office Box 611311
19421942
S: San Jose, California 95161-1311
19431943
S: USA
19441944

1945+
N: Hartmut Knaack
1946+
1947+
D: IIO subsystem and drivers
1948+
19451949
N: Thorsten Knabe
19461950
E: Thorsten Knabe <[email protected]>
19471951
E: Thorsten Knabe <[email protected]>

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 62 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Description:
4040
buffered samples and events for device X.
4141

4242
What: /sys/bus/iio/devices/iio:deviceX/sampling_frequency
43+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_sampling_frequency
4344
What: /sys/bus/iio/devices/iio:deviceX/buffer/sampling_frequency
4445
What: /sys/bus/iio/devices/triggerX/sampling_frequency
4546
KernelVersion: 2.6.35
@@ -49,12 +50,13 @@ Description:
4950
resulting sampling frequency. In many devices this
5051
parameter has an effect on input filters etc. rather than
5152
simply controlling when the input is sampled. As this
52-
effects data ready triggers, hardware buffers and the sysfs
53+
affects data ready triggers, hardware buffers and the sysfs
5354
direct access interfaces, it may be found in any of the
54-
relevant directories. If it effects all of the above
55+
relevant directories. If it affects all of the above
5556
then it is to be found in the base device directory.
5657

5758
What: /sys/bus/iio/devices/iio:deviceX/sampling_frequency_available
59+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_sampling_frequency_available
5860
What: /sys/bus/iio/devices/iio:deviceX/in_proximity_sampling_frequency_available
5961
What: /sys/.../iio:deviceX/buffer/sampling_frequency_available
6062
What: /sys/bus/iio/devices/triggerX/sampling_frequency_available
@@ -374,6 +376,9 @@ What: /sys/bus/iio/devices/iio:deviceX/in_velocity_sqrt(x^2+y^2+z^2)_scale
374376
What: /sys/bus/iio/devices/iio:deviceX/in_illuminance_scale
375377
What: /sys/bus/iio/devices/iio:deviceX/in_countY_scale
376378
What: /sys/bus/iio/devices/iio:deviceX/in_angl_scale
379+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_x_scale
380+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_y_scale
381+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_z_scale
377382
KernelVersion: 2.6.35
378383
379384
Description:
@@ -401,21 +406,21 @@ Description:
401406
Hardware applied calibration offset (assumed to fix production
402407
inaccuracies).
403408

404-
What /sys/bus/iio/devices/iio:deviceX/in_voltageY_calibscale
405-
What /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_calibscale
406-
What /sys/bus/iio/devices/iio:deviceX/in_voltageY_i_calibscale
407-
What /sys/bus/iio/devices/iio:deviceX/in_voltageY_q_calibscale
408-
What /sys/bus/iio/devices/iio:deviceX/in_voltage_i_calibscale
409-
What /sys/bus/iio/devices/iio:deviceX/in_voltage_q_calibscale
410-
What /sys/bus/iio/devices/iio:deviceX/in_voltage_calibscale
411-
What /sys/bus/iio/devices/iio:deviceX/in_accel_x_calibscale
412-
What /sys/bus/iio/devices/iio:deviceX/in_accel_y_calibscale
413-
What /sys/bus/iio/devices/iio:deviceX/in_accel_z_calibscale
414-
What /sys/bus/iio/devices/iio:deviceX/in_anglvel_x_calibscale
415-
What /sys/bus/iio/devices/iio:deviceX/in_anglvel_y_calibscale
416-
What /sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibscale
417-
what /sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibscale
418-
what /sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale
409+
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_calibscale
410+
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_calibscale
411+
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_i_calibscale
412+
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_q_calibscale
413+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage_i_calibscale
414+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage_q_calibscale
415+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage_calibscale
416+
What: /sys/bus/iio/devices/iio:deviceX/in_accel_x_calibscale
417+
What: /sys/bus/iio/devices/iio:deviceX/in_accel_y_calibscale
418+
What: /sys/bus/iio/devices/iio:deviceX/in_accel_z_calibscale
419+
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_x_calibscale
420+
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_y_calibscale
421+
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibscale
422+
What: /sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibscale
423+
What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale
419424
What: /sys/bus/iio/devices/iio:deviceX/in_pressureY_calibscale
420425
What: /sys/bus/iio/devices/iio:deviceX/in_pressure_calibscale
421426
What: /sys/bus/iio/devices/iio:deviceX/in_illuminance_calibscale
@@ -483,7 +488,8 @@ Description:
483488
If a discrete set of scale values is available, they
484489
are listed in this attribute.
485490

486-
What /sys/bus/iio/devices/iio:deviceX/out_voltageY_hardwaregain
491+
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_hardwaregain
492+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_hardwaregain
487493
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_red_hardwaregain
488494
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_green_hardwaregain
489495
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_blue_hardwaregain
@@ -494,6 +500,13 @@ Description:
494500
Hardware applied gain factor. If shared across all channels,
495501
<type>_hardwaregain is used.
496502

503+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_hardwaregain_available
504+
KernelVersion: 5.10
505+
506+
Description:
507+
Lists all available hardware applied gain factors. Shared across all
508+
channels.
509+
497510
What: /sys/.../in_accel_filter_low_pass_3db_frequency
498511
What: /sys/.../in_magn_filter_low_pass_3db_frequency
499512
What: /sys/.../in_anglvel_filter_low_pass_3db_frequency
@@ -750,9 +763,9 @@ What: /sys/.../events/in_voltageY_raw_thresh_falling_value
750763
What: /sys/.../events/in_tempY_raw_thresh_rising_value
751764
What: /sys/.../events/in_tempY_raw_thresh_falling_value
752765
What: /sys/.../events/in_illuminance0_thresh_falling_value
753-
what: /sys/.../events/in_illuminance0_thresh_rising_value
754-
what: /sys/.../events/in_proximity0_thresh_falling_value
755-
what: /sys/.../events/in_proximity0_thresh_rising_value
766+
What: /sys/.../events/in_illuminance0_thresh_rising_value
767+
What: /sys/.../events/in_proximity0_thresh_falling_value
768+
What: /sys/.../events/in_proximity0_thresh_rising_value
756769
What: /sys/.../events/in_illuminance_thresh_rising_value
757770
What: /sys/.../events/in_illuminance_thresh_falling_value
758771
KernelVersion: 2.6.37
@@ -832,11 +845,11 @@ What: /sys/.../events/in_tempY_thresh_rising_hysteresis
832845
What: /sys/.../events/in_tempY_thresh_falling_hysteresis
833846
What: /sys/.../events/in_tempY_thresh_either_hysteresis
834847
What: /sys/.../events/in_illuminance0_thresh_falling_hysteresis
835-
what: /sys/.../events/in_illuminance0_thresh_rising_hysteresis
836-
what: /sys/.../events/in_illuminance0_thresh_either_hysteresis
837-
what: /sys/.../events/in_proximity0_thresh_falling_hysteresis
838-
what: /sys/.../events/in_proximity0_thresh_rising_hysteresis
839-
what: /sys/.../events/in_proximity0_thresh_either_hysteresis
848+
What: /sys/.../events/in_illuminance0_thresh_rising_hysteresis
849+
What: /sys/.../events/in_illuminance0_thresh_either_hysteresis
850+
What: /sys/.../events/in_proximity0_thresh_falling_hysteresis
851+
What: /sys/.../events/in_proximity0_thresh_rising_hysteresis
852+
What: /sys/.../events/in_proximity0_thresh_either_hysteresis
840853
KernelVersion: 3.13
841854
842855
Description:
@@ -1013,7 +1026,7 @@ What: /sys/.../events/in_activity_running_thresh_falling_en
10131026
KernelVersion: 3.19
10141027
10151028
Description:
1016-
Enables or disables activitity events. Depending on direction
1029+
Enables or disables activity events. Depending on direction
10171030
an event is generated when sensor ENTERS or LEAVES a given state.
10181031

10191032
What: /sys/.../events/in_activity_still_thresh_rising_value
@@ -1333,6 +1346,7 @@ Description:
13331346
standardised CIE Erythemal Action Spectrum. UV index values range
13341347
from 0 (low) to >=11 (extreme).
13351348

1349+
What: /sys/.../iio:deviceX/in_intensity_integration_time
13361350
What: /sys/.../iio:deviceX/in_intensity_red_integration_time
13371351
What: /sys/.../iio:deviceX/in_intensity_green_integration_time
13381352
What: /sys/.../iio:deviceX/in_intensity_blue_integration_time
@@ -1342,7 +1356,8 @@ KernelVersion: 3.12
13421356
13431357
Description:
13441358
This attribute is used to get/set the integration time in
1345-
seconds.
1359+
seconds. If shared across all channels of a given type,
1360+
<type>_integration_time is used.
13461361

13471362
What: /sys/.../iio:deviceX/in_velocity_sqrt(x^2+y^2+z^2)_integration_time
13481363
KernelVersion: 4.0
@@ -1564,6 +1579,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentration_ethanol_raw
15641579
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_ethanol_raw
15651580
What: /sys/bus/iio/devices/iio:deviceX/in_concentration_h2_raw
15661581
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_h2_raw
1582+
What: /sys/bus/iio/devices/iio:deviceX/in_concentration_o2_raw
1583+
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_o2_raw
15671584
What: /sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw
15681585
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw
15691586
KernelVersion: 4.3
@@ -1740,3 +1757,20 @@ KernelVersion: 5.5
17401757
17411758
Description:
17421759
One of the following thermocouple types: B, E, J, K, N, R, S, T.
1760+
1761+
What: /sys/bus/iio/devices/iio:deviceX/in_temp_object_calibambient
1762+
What: /sys/bus/iio/devices/iio:deviceX/in_tempX_object_calibambient
1763+
KernelVersion: 5.10
1764+
1765+
Description:
1766+
Calibrated ambient temperature for object temperature
1767+
calculation in milli degrees Celsius.
1768+
1769+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_x_raw
1770+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_y_raw
1771+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_z_raw
1772+
KernelVersion: 5.10
1773+
1774+
Description:
1775+
Unscaled light intensity according to CIE 1931/DIN 5033 color space.
1776+
Units after application of scale are nano nanowatts per square meter.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
What: /sys/bus/iio/devices/triggerX/name = "adxl372-devX-peak"
2+
KernelVersion:
3+
4+
Description:
5+
The adxl372 accelerometer kernel module provides an additional trigger,
6+
which sets the device in a mode in which it will record only the peak acceleration
7+
sensed over the set period of time in the events sysfs.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/out_current_heater_raw
2+
What: /sys/bus/iio/devices/iio:deviceX/out_current_heater_raw_available
3+
KernelVersion: 5.3.8
4+
5+
Description:
6+
Controls the heater device within the humidity sensor to get
7+
rid of excess condensation.
8+
9+
Valid control values are 0 = OFF, and 1 = ON.

Documentation/devicetree/bindings/iio/adc/ad7949.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/adc/adi,ad7291.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: AD7291 8-Channel, I2C, 12-Bit SAR ADC with Temperature Sensor
8+
9+
maintainers:
10+
- Michael Auchter <[email protected]>
11+
12+
description: |
13+
Analog Devices AD7291 8-Channel I2C 12-Bit SAR ADC with Temperature Sensor
14+
https://www.analog.com/media/en/technical-documentation/data-sheets/ad7291.pdf
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- adi,ad7291
20+
21+
reg:
22+
maxItems: 1
23+
24+
vref-supply:
25+
description: |
26+
The regulator supply for ADC reference voltage.
27+
28+
required:
29+
- compatible
30+
- reg
31+
32+
additionalProperties: false
33+
34+
examples:
35+
- |
36+
i2c {
37+
#address-cells = <1>;
38+
#size-cells = <0>;
39+
40+
ad7291: adc@0 {
41+
compatible = "adi,ad7291";
42+
reg = <0>;
43+
vref-supply = <&adc_vref>;
44+
};
45+
};
46+
...

Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt

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

0 commit comments

Comments
 (0)