Skip to content

Commit 4c6ef3b

Browse files
committed
Merge tag 'staging-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging and IIO driver updates from Greg KH: "Here is the big staging and IIO driver pull request for 5.7-rc1. We again end up deleting more code than we added here, thanks to finally getting rid of the old and obsolete wireless USB stuff, and the exfat code (which is coming in again through the vfs tree in a much cleaner version). But some code does come back, with the octeon drivers being found to actually be used in the wild, so those deletions are now reverted. Other than those major things, just loads and loads of tiny checkpatch cleanups all over the place, along with new IIO drivers and fixes. All have been in linux-next with no reported issues" [ Stephen Rothwell points out some reported issues due to merge conflicts ] * tag 'staging-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (415 commits) staging: vt6656: Use DIV_ROUND_UP macro instead of specific code staging: remove hp100 driver staging: wilc1000: Use crc7 in lib/ rather than a private copy Staging: rtl8192u: ieee80211: Use netdev_alert(). Staging: rtl8192u: ieee80211: Use netdev_info() with network devices. Staging: rtl8192u: ieee80211: Use netdev_warn() for network devices. Staging: rtl8192u: ieee80211: Use netdev_dbg() for debug messages. staging: wlan-ng: fix use-after-free Read in hfa384x_usbin_callback staging: rtl8723bs: hal: Remove NULL check before kfree staging: rtl8723bs: hal: Correct typos in comments staging: rtl8723bs: os_dep: Correct typos in comments staging: rtl8723bs: core: Correct typos in comments staging: rtl8723bs: hal: Remove unnecessary cast on void pointer staging: rtl8188eu: cleanup long line in odm.c staging: rtl8723bs: hal: Compress return logic staging: rtl8723bs: rtw_cmd: Compress lines for immediate return staging: rtl8723bs: rtw_efuse: Compress lines for immediate return staging: wilc1000: remove label from examples in DT binding documentation staging: rtl8723bs: Remove blank line before '}' brace Staging: rtl8188eu: hal: Add space around operators ...
2 parents 5983809 + e681bb2 commit 4c6ef3b

File tree

498 files changed

+20196
-47977
lines changed

Some content is hidden

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

498 files changed

+20196
-47977
lines changed

drivers/staging/most/Documentation/ABI/configfs-most.txt renamed to Documentation/ABI/testing/configfs-most

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,3 @@ Description:
194194

195195
destroy_link write '1' to this attribute to destroy an
196196
active link
197-
198-
What: /sys/kernel/config/rdma_cm/<hca>/ports/<port-num>/default_roce_tos
199-
Date: March 8, 2019
200-
KernelVersion: 5.2
201-
Description: RDMA-CM QPs from HCA <hca> at port <port-num>
202-
will be created with this TOS as default.
203-
This can be overridden by using the rdma_set_option API.
204-
The possible RoCE TOS values are 0-255.

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
What: /sys/bus/counter/devices/counterX/signalY/cable_fault
2+
KernelVersion: 5.7
3+
4+
Description:
5+
Read-only attribute that indicates whether a differential
6+
encoder cable fault (not connected or loose wires) is detected
7+
for the respective channel of Signal Y. Valid attribute values
8+
are boolean. Detection must first be enabled via the
9+
corresponding cable_fault_enable attribute.
10+
11+
What: /sys/bus/counter/devices/counterX/signalY/cable_fault_enable
12+
KernelVersion: 5.7
13+
14+
Description:
15+
Whether detection of differential encoder cable faults for the
16+
respective channel of Signal Y is enabled. Valid attribute
17+
values are boolean.
18+
19+
What: /sys/bus/counter/devices/counterX/signalY/filter_clock_prescaler
20+
KernelVersion: 5.7
21+
22+
Description:
23+
Filter clock factor for input Signal Y. This prescaler value
24+
affects the inputs of both quadrature pair signals.
25+
126
What: /sys/bus/counter/devices/counterX/signalY/index_polarity
227
KernelVersion: 5.2
328

Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,22 @@ What: /sys/bus/iio/devices/iio:deviceX/ac_excitation_en
22
KernelVersion:
33
44
Description:
5-
Reading gives the state of AC excitation.
6-
Writing '1' enables AC excitation.
5+
This attribute, if available, is used to enable the AC
6+
excitation mode found on some converters. In ac excitation mode,
7+
the polarity of the excitation voltage is reversed on
8+
alternate cycles, to eliminate DC errors.
79

810
What: /sys/bus/iio/devices/iio:deviceX/bridge_switch_en
911
KernelVersion:
1012
1113
Description:
12-
This bridge switch is used to disconnect it when there is a
13-
need to minimize the system current consumption.
14-
Reading gives the state of the bridge switch.
15-
Writing '1' enables the bridge switch.
14+
This attribute, if available, is used to close or open the
15+
bridge power down switch found on some converters.
16+
In bridge applications, such as strain gauges and load cells,
17+
the bridge itself consumes the majority of the current in the
18+
system. To minimize the current consumption of the system,
19+
the bridge can be disconnected (when it is not being used
20+
using the bridge_switch_en attribute.
1621

1722
What: /sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration
1823
KernelVersion:
@@ -21,6 +26,13 @@ Description:
2126
Initiates the system calibration procedure. This is done on a
2227
single channel at a time. Write '1' to start the calibration.
2328

29+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage2-voltage2_shorted_raw
30+
KernelVersion:
31+
32+
Description:
33+
Measure voltage from AIN2 pin connected to AIN(+)
34+
and AIN(-) shorted.
35+
2436
What: /sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration_mode_available
2537
KernelVersion:
2638

drivers/staging/most/Documentation/ABI/sysfs-bus-most.txt renamed to Documentation/ABI/testing/sysfs-bus-most

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Contact: Christian Gromm <[email protected]>
55
Description:
66
Provides information about the interface type and the physical
77
location of the device. Hardware attached via USB, for instance,
8-
might return <usb_device 1-1.1:1.0>
8+
might return <1-1.1:1.0>
99
Users:
1010

1111
What: /sys/bus/most/devices/.../interface
@@ -278,33 +278,15 @@ Description:
278278
Indicates whether current channel ran out of buffers.
279279
Users:
280280

281-
What: /sys/bus/most/drivers/mostcore/add_link
282-
Date: March 2017
283-
KernelVersion: 4.15
284-
Contact: Christian Gromm <[email protected]>
285-
Description:
286-
This is used to link a channel to a component of the
287-
mostcore. A link created by writing to this file is
288-
referred to as pipe.
289-
Users:
290-
291-
What: /sys/bus/most/drivers/mostcore/remove_link
292-
Date: March 2017
293-
KernelVersion: 4.15
294-
Contact: Christian Gromm <[email protected]>
295-
Description:
296-
This is used to unlink a channel from a component.
297-
Users:
298-
299-
What: /sys/bus/most/drivers/mostcore/components
281+
What: /sys/bus/most/drivers/most_core/components
300282
Date: March 2017
301283
KernelVersion: 4.15
302284
Contact: Christian Gromm <[email protected]>
303285
Description:
304286
This is used to retrieve a list of registered components.
305287
Users:
306288

307-
What: /sys/bus/most/drivers/mostcore/links
289+
What: /sys/bus/most/drivers/most_core/links
308290
Date: March 2017
309291
KernelVersion: 4.15
310292
Contact: Christian Gromm <[email protected]>
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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,ad7923.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices AD7923 and similars with 4 and 8 Channel ADCs.
8+
9+
maintainers:
10+
- Michael Hennerich <[email protected]>
11+
- Patrick Vasseur <[email protected]>
12+
13+
description: |
14+
Analog Devices AD7904, AD7914, AD7923, AD7924 4 Channel ADCs, and AD7908,
15+
AD7918, AD7928 8 Channels ADCs.
16+
17+
Specifications about the part can be found at:
18+
https://www.analog.com/media/en/technical-documentation/data-sheets/AD7923.pdf
19+
https://www.analog.com/media/en/technical-documentation/data-sheets/AD7904_7914_7924.pdf
20+
https://www.analog.com/media/en/technical-documentation/data-sheets/AD7908_7918_7928.pdf
21+
22+
properties:
23+
compatible:
24+
enum:
25+
- adi,ad7904
26+
- adi,ad7914
27+
- adi,ad7923
28+
- adi,ad7924
29+
- adi,ad7908
30+
- adi,ad7918
31+
- adi,ad7928
32+
33+
reg:
34+
maxItems: 1
35+
36+
refin-supply:
37+
description: |
38+
The regulator supply for ADC reference voltage.
39+
40+
'#address-cells':
41+
const: 1
42+
43+
'#size-cells':
44+
const: 0
45+
46+
required:
47+
- compatible
48+
- reg
49+
50+
examples:
51+
- |
52+
spi {
53+
#address-cells = <1>;
54+
#size-cells = <0>;
55+
56+
ad7928: adc@0 {
57+
compatible = "adi,ad7928";
58+
reg = <0>;
59+
spi-max-frequency = <25000000>;
60+
refin-supply = <&adc_vref>;
61+
62+
#address-cells = <1>;
63+
#size-cells = <0>;
64+
};
65+
};

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

Lines changed: 0 additions & 63 deletions
This file was deleted.
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/adc/maxim,max1238.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Maxim MAX1238 and similar ADCs
8+
9+
maintainers:
10+
- Jonathan Cameron <[email protected]>
11+
12+
description: |
13+
Family of simple ADCs with i2c inteface and internal references.
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- maxim,max1036
19+
- maxim,max1037
20+
- maxim,max1038
21+
- maxim,max1039
22+
- maxim,max1136
23+
- maxim,max1137
24+
- maxim,max1138
25+
- maxim,max1139
26+
- maxim,max1236
27+
- maxim,max1237
28+
- maxim,max1238
29+
- maxim,max1239
30+
- maxim,max11600
31+
- maxim,max11601
32+
- maxim,max11602
33+
- maxim,max11603
34+
- maxim,max11604
35+
- maxim,max11605
36+
- maxim,max11606
37+
- maxim,max11607
38+
- maxim,max11608
39+
- maxim,max11609
40+
- maxim,max11610
41+
- maxim,max11611
42+
- maxim,max11612
43+
- maxim,max11613
44+
- maxim,max11614
45+
- maxim,max11615
46+
- maxim,max11616
47+
- maxim,max11617
48+
- maxim,max11644
49+
- maxim,max11645
50+
- maxim,max11646
51+
- maxim,max11647
52+
53+
reg:
54+
maxItems: 1
55+
56+
vcc-supply: true
57+
vref-supply:
58+
description: Optional external reference. If not supplied, internal
59+
reference will be used.
60+
61+
required:
62+
- compatible
63+
- reg
64+
65+
examples:
66+
- |
67+
i2c {
68+
#address-cells = <1>;
69+
#size-cells = <0>;
70+
71+
adc@36 {
72+
compatible = "maxim,max1238";
73+
reg = <0x36>;
74+
};
75+
};
76+
...
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/adc/maxim,max1363.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Maxim MAX1363 and similar ADCs
8+
9+
maintainers:
10+
- Jonathan Cameron <[email protected]>
11+
12+
description: |
13+
Family of ADCs with i2c inteface, internal references and threshold
14+
monitoring.
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- maxim,max1361
20+
- maxim,max1362
21+
- maxim,max1363
22+
- maxim,max1364
23+
24+
reg:
25+
maxItems: 1
26+
27+
vcc-supply: true
28+
vref-supply:
29+
description: Optional external reference. If not supplied, internal
30+
reference will be used.
31+
32+
interrupts:
33+
maxItems: 1
34+
35+
required:
36+
- compatible
37+
- reg
38+
39+
examples:
40+
- |
41+
i2c {
42+
#address-cells = <1>;
43+
#size-cells = <0>;
44+
45+
adc@36 {
46+
compatible = "maxim,max1363";
47+
reg = <0x36>;
48+
};
49+
};
50+
...

0 commit comments

Comments
 (0)