Skip to content

Commit 7ba31c3

Browse files
torvaldstorvalds
committed
Merge tag 'staging-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging and IIO updates from Greg KH: "Here is the big staging/iio driver patches for 5.6-rc1 Included in here are: - lots of new IIO drivers and updates for that subsystem - the usual huge quantity of minor cleanups for staging drivers - removal of the following staging drivers: - isdn/avm - isdn/gigaset - isdn/hysdn - octeon-usb - octeon ethernet Overall we deleted far more lines than we added, removing over 40k of old and obsolete driver code. All of these changes have been in linux-next for a while with no reported issues" * tag 'staging-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (353 commits) staging: most: usb: check for NULL device staging: next: configfs: fix release link staging: most: core: fix logging messages staging: most: core: remove container struct staging: most: remove struct device core driver staging: most: core: drop device reference staging: most: remove device from interface structure staging: comedi: drivers: fix spelling mistake "to" -> "too" staging: exfat: remove fs_func struct. staging: wilc1000: avoid mutex unlock without lock in wilc_wlan_handle_txq() staging: wilc1000: return zero on success and non-zero on function failure staging: axis-fifo: replace spinlock with mutex staging: wilc1000: remove unused code prior to throughput enhancement in SPI staging: wilc1000: added 'wilc_' prefix for 'struct assoc_resp' name staging: wilc1000: move firmware API struct's to separate header file staging: wilc1000: remove use of infinite loop conditions staging: kpc2000: rename variables with kpc namespace staging: vt6656: Remove memory buffer from vnt_download_firmware. staging: vt6656: Just check NEWRSR_DECRYPTOK for RX_FLAG_DECRYPTED. staging: vt6656: Use vnt_rx_tail struct for tail variables. ...
2 parents ca9b5b6 + fc15799 commit 7ba31c3

File tree

351 files changed

+7825
-40990
lines changed

Some content is hidden

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

351 files changed

+7825
-40990
lines changed

‎Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1726,3 +1726,16 @@ Contact: [email protected]
17261726
Description:
17271727
List of valid periods (in seconds) for which the light intensity
17281728
must be above the threshold level before interrupt is asserted.
1729+
1730+
What: /sys/bus/iio/devices/iio:deviceX/in_filter_notch_center_frequency
1731+
KernelVersion: 5.5
1732+
Contact: [email protected]
1733+
Description:
1734+
Center frequency in Hz for a notch filter. Used i.e. for line
1735+
noise suppression.
1736+
1737+
What: /sys/bus/iio/devices/iio:deviceX/in_temp_thermocouple_type
1738+
KernelVersion: 5.5
1739+
Contact: [email protected]
1740+
Description:
1741+
One of the following thermocouple types: B, E, J, K, N, R, S, T.

‎Documentation/ABI/testing/sysfs-bus-iio-dma-buffer

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/buffer/length_align_bytes
2+
KernelVersion: 5.4
3+
Contact: [email protected]
4+
Description:
5+
DMA buffers tend to have a alignment requirement for the
6+
buffers. If this alignment requirement is not met samples might
7+
be dropped from the buffer.
8+
9+
This property reports the alignment requirements in bytes.
10+
This means that the buffer size in bytes needs to be a integer
11+
multiple of the number reported by this file.
12+
13+
The alignment requirements in number of sample sets will depend
14+
on the enabled channels and the bytes per channel. This means
15+
that the alignment requirement in samples sets might change
16+
depending on which and how many channels are enabled. Whereas
17+
the alignment requirement reported in bytes by this property
18+
will remain static and does not depend on which channels are
19+
enabled.

‎Documentation/devicetree/bindings/iio/accel/adi,adis16240.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/accel/adi,adis16240.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ADIS16240 Programmable Impact Sensor and Recorder driver
8+
9+
maintainers:
10+
- Alexandru Ardelean <[email protected]>
11+
12+
description: |
13+
ADIS16240 Programmable Impact Sensor and Recorder driver that supports
14+
SPI interface.
15+
https://www.analog.com/en/products/adis16240.html
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- adi,adis16240
21+
22+
reg:
23+
maxItems: 1
24+
25+
interrupts:
26+
maxItems: 1
27+
28+
required:
29+
- compatible
30+
- reg
31+
- interrupts
32+
33+
examples:
34+
- |
35+
#include <dt-bindings/gpio/gpio.h>
36+
#include <dt-bindings/interrupt-controller/irq.h>
37+
spi0 {
38+
#address-cells = <1>;
39+
#size-cells = <0>;
40+
41+
/* Example for a SPI device node */
42+
accelerometer@0 {
43+
compatible = "adi,adis16240";
44+
reg = <0>;
45+
spi-max-frequency = <2500000>;
46+
interrupt-parent = <&gpio0>;
47+
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
48+
};
49+
};

‎Documentation/devicetree/bindings/iio/accel/bma180.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
* Bosch BMA180 / BMA250 triaxial acceleration sensor
1+
* Bosch BMA180 / BMA25x triaxial acceleration sensor
22

33
http://omapworld.com/BMA180_111_1002839.pdf
44
http://ae-bst.resource.bosch.com/media/products/dokumente/bma250/bst-bma250-ds002-05.pdf
55

66
Required properties:
77

8-
- compatible : should be "bosch,bma180" or "bosch,bma250"
8+
- compatible : should be one of:
9+
"bosch,bma180"
10+
"bosch,bma250"
11+
"bosch,bma254"
912
- reg : the I2C address of the sensor
1013

1114
Optional properties:

‎Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/accel/bosch,bma400.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Bosch BMA400 triaxial acceleration sensor
8+
9+
maintainers:
10+
- Dan Robertson <[email protected]>
11+
12+
description: |
13+
Acceleration and temperature iio sensors with an i2c interface
14+
15+
Specifications about the sensor can be found at:
16+
https://ae-bst.resource.bosch.com/media/_tech/media/datasheets/BST-BMA400-DS000.pdf
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- bosch,bma400
22+
23+
reg:
24+
maxItems: 1
25+
26+
vdd-supply:
27+
description: phandle to the regulator that provides power to the accelerometer
28+
29+
vddio-supply:
30+
description: phandle to the regulator that provides power to the sensor's IO
31+
32+
interrupts:
33+
maxItems: 1
34+
35+
required:
36+
- compatible
37+
- reg
38+
39+
examples:
40+
- |
41+
#include <dt-bindings/gpio/gpio.h>
42+
#include <dt-bindings/interrupt-controller/irq.h>
43+
i2c {
44+
#address-cells = <1>;
45+
#size-cells = <0>;
46+
accelerometer@14 {
47+
compatible = "bosch,bma400";
48+
reg = <0x14>;
49+
vdd-supply = <&vdd>;
50+
vddio-supply = <&vddio>;
51+
interrupt-parent = <&gpio0>;
52+
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
53+
};
54+
};

‎Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,16 @@ Required properties:
99
"kionix,kxtf9"
1010
- reg: i2c slave address
1111

12+
Optional properties:
13+
14+
- mount-matrix: an optional 3x3 mounting rotation matrix
15+
1216
Example:
1317

1418
kxtf9@f {
1519
compatible = "kionix,kxtf9";
1620
reg = <0x0F>;
21+
mount-matrix = "0", "1", "0",
22+
"1", "0", "0",
23+
"0", "0", "1";
1724
};

‎Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
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,ad7091r5.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices AD7091R5 4-Channel 12-Bit ADC
8+
9+
maintainers:
10+
- Beniamin Bia <[email protected]>
11+
12+
description: |
13+
Analog Devices AD7091R5 4-Channel 12-Bit ADC
14+
https://www.analog.com/media/en/technical-documentation/data-sheets/ad7091r-5.pdf
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- adi,ad7091r5
20+
21+
reg:
22+
maxItems: 1
23+
24+
vref-supply:
25+
description:
26+
Phandle to the vref power supply
27+
28+
interrupts:
29+
maxItems: 1
30+
31+
32+
required:
33+
- compatible
34+
- reg
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
#include <dt-bindings/gpio/gpio.h>
41+
#include <dt-bindings/interrupt-controller/irq.h>
42+
i2c {
43+
#address-cells = <1>;
44+
#size-cells = <0>;
45+
46+
adc@2f {
47+
compatible = "adi,ad7091r5";
48+
reg = <0x2f>;
49+
50+
interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
51+
interrupt-parent = <&gpio>;
52+
};
53+
};
54+
...

‎Documentation/devicetree/bindings/iio/adc/lltc,ltc2496.yaml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/adc/lltc,ltc2496.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Linear Technology / Analog Devices LTC2496 ADC
8+
9+
maintainers:
10+
- Lars-Peter Clausen <[email protected]>
11+
- Michael Hennerich <[email protected]>
12+
- Stefan Popa <[email protected]>
13+
14+
properties:
15+
compatible:
16+
enum:
17+
- lltc,ltc2496
18+
19+
vref-supply:
20+
description: phandle to an external regulator providing the reference voltage
21+
allOf:
22+
- $ref: /schemas/types.yaml#/definitions/phandle
23+
24+
reg:
25+
description: spi chipselect number according to the usual spi bindings
26+
27+
spi-max-frequency:
28+
description: maximal spi bus frequency supported
29+
30+
required:
31+
- compatible
32+
- vref-supply
33+
- reg
34+
35+
examples:
36+
- |
37+
spi {
38+
#address-cells = <1>;
39+
#size-cells = <0>;
40+
41+
adc@0 {
42+
compatible = "lltc,ltc2496";
43+
reg = <0>;
44+
vref-supply = <&ltc2496_reg>;
45+
spi-max-frequency = <2000000>;
46+
};
47+
};

‎Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt

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

‎Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.yaml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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/sigma-delta-modulator.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Device-Tree bindings for sigma delta modulator
8+
9+
maintainers:
10+
- Arnaud Pouliquen <[email protected]>
11+
12+
properties:
13+
compatible:
14+
description: |
15+
"sd-modulator" can be used as a generic SD modulator,
16+
if the modulator is not specified in the compatible list.
17+
enum:
18+
- sd-modulator
19+
- ads1201
20+
21+
'#io-channel-cells':
22+
const: 0
23+
24+
required:
25+
- compatible
26+
- '#io-channel-cells'
27+
28+
additionalProperties: false
29+
30+
examples:
31+
- |
32+
ads1202: adc {
33+
compatible = "sd-modulator";
34+
#io-channel-cells = <0>;
35+
};
36+
37+
...

0 commit comments

Comments
 (0)