Skip to content

Commit c0c419c

Browse files
committed
Merge tag 'staging-5.9-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 patches for 5.9-rc1. Lots of churn here, but overall the size increase in lines added is small, while adding a load of new IIO drivers. Major things in here: - lots and lots of IIO new drivers and frameworks added - IIO driver fixes and updates - lots of tiny coding style cleanups for staging drivers - vc04_services major reworks and cleanups We had 3 set of drivers move out of staging in this round as well: - wilc1000 wireless driver moved out of staging - speakup moved out of staging - most USB driver moved out of staging Full details are in the shortlog. All of these have been in linux-next with no reported issues. The last few changes here were to resolve reported linux-next issues, and they seem to have resolved the problems" * tag 'staging-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (428 commits) staging: most: fix up movement of USB driver staging: rts5208: clear alignment style issues staging: r8188eu: replace rtw_netdev_priv define with inline function staging: netlogic: clear alignment style issues staging: android: ashmem: Fix lockdep warning for write operation drivers: most: add USB adapter driver staging: most: Use %pM format specifier for MAC addresses staging: ks7010: Use %pM format specifier for MAC addresses staging: qlge: qlge_dbg: removed comment repition staging: wfx: Use flex_array_size() helper in memcpy() staging: rtl8723bs: Align macro definitions staging: rtl8723bs: Clean up function declations staging: rtl8723bs: Fix coding style errors drivers: staging: audio: Fix the missing header file for helper file staging: greybus: audio: Enable GB codec, audio module compilation. staging: greybus: audio: Add helper APIs for dynamic audio modules staging: greybus: audio: Resolve compilation error in topology parser staging: greybus: audio: Resolve compilation errors for GB codec module staging: greybus: audio: Maintain jack list within GB Audio module staging: greybus: audio: Update snd_jack FW usage as per new APIs ...
2 parents 3f9df56 + 5bbd905 commit c0c419c

File tree

829 files changed

+12193
-7174
lines changed

Some content is hidden

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

829 files changed

+12193
-7174
lines changed

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1569,7 +1569,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw
15691569
KernelVersion: 4.3
15701570
15711571
Description:
1572-
Raw (unscaled no offset etc.) percentage reading of a substance.
1572+
Raw (unscaled no offset etc.) reading of a substance. Units
1573+
after application of scale and offset are percents.
15731574

15741575
What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw
15751576
What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/in_accel_x_calibbias
2+
What: /sys/bus/iio/devices/iio:deviceX/in_accel_y_calibbias
3+
What: /sys/bus/iio/devices/iio:deviceX/in_accel_z_calibbias
4+
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_x_calibbias
5+
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_y_calibbias
6+
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibbias
7+
KernelVersion: 5.8
8+
9+
Description:
10+
Hardware applied calibration offset (assumed to fix production
11+
inaccuracies). Values represent a real physical offset expressed
12+
in SI units (m/s^2 for accelerometer and rad/s for gyroscope).
13+
14+
What: /sys/bus/iio/devices/iio:deviceX/in_accel_calibbias_available
15+
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_calibbias_available
16+
KernelVersion: 5.8
17+
18+
Description:
19+
Range of available values for hardware offset. Values in SI
20+
units (m/s^2 for accelerometer and rad/s for gyroscope).
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/calibration_auto_enable
2+
Date: June 2020
3+
KernelVersion: 5.8
4+
5+
Description:
6+
Contaminants build-up in the measurement chamber or optical
7+
elements deterioration leads to sensor drift.
8+
9+
One can compensate for sensor drift by using automatic self
10+
calibration procedure (asc).
11+
12+
Writing 1 or 0 to this attribute will respectively activate or
13+
deactivate asc.
14+
15+
Upon reading current asc status is returned.
16+
17+
What: /sys/bus/iio/devices/iio:deviceX/calibration_forced_value
18+
Date: June 2020
19+
KernelVersion: 5.8
20+
21+
Description:
22+
Contaminants build-up in the measurement chamber or optical
23+
elements deterioration leads to sensor drift.
24+
25+
One can compensate for sensor drift by using forced
26+
recalibration (frc). This is useful in case there's known
27+
co2 reference available nearby the sensor.
28+
29+
Picking value from the range [400 1 2000] and writing it to the
30+
sensor will set frc.
31+
32+
Upon reading current frc value is returned. Note that after
33+
power cycling default value (i.e 400) is returned even though
34+
internally sensor had recalibrated itself.

drivers/staging/speakup/spkguide.txt renamed to Documentation/admin-guide/spkguide.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1531,7 +1531,7 @@ The Free Software Foundation may publish new, revised versions
15311531
of the GNU Free Documentation License from time to time. Such new
15321532
versions will be similar in spirit to the present version, but may
15331533
differ in detail to address new problems or concerns. See
1534-
http://www.gnu.org/copyleft/.
1534+
https://www.gnu.org/copyleft/.
15351535

15361536
Each version of the License is given a distinguishing version number.
15371537
If the Document specifies that a particular numbered version of this

Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ maintainers:
1212
description: |
1313
Analog Devices ADXL345/ADXL375 3-Axis Digital Accelerometers that supports
1414
both I2C & SPI interfaces.
15-
http://www.analog.com/en/products/mems/accelerometers/adxl345.html
16-
http://www.analog.com/en/products/sensors-mems/accelerometers/adxl375.html
15+
https://www.analog.com/en/products/mems/accelerometers/adxl345.html
16+
https://www.analog.com/en/products/sensors-mems/accelerometers/adxl375.html
1717
1818
properties:
1919
compatible:

Documentation/devicetree/bindings/iio/accel/kionix,kxsd9.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.
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 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/accel/kionix,kxsd9.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Kionix KXSD9 Accelerometer
8+
9+
maintainers:
10+
- Jonathan Cameron <[email protected]>
11+
12+
description: |
13+
3 axis 12 bit accelerometer with +-8G range on all axes. Also has a
14+
12 bit auxiliary ADC channel. Interface is either SPI or I2C.
15+
16+
properties:
17+
compatible:
18+
const: kionix,kxsd9
19+
20+
reg:
21+
maxItems: 1
22+
23+
vdd-supply: true
24+
iovdd-supply: true
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
mount-matrix:
30+
description: an optional 3x3 mounting rotation matrix.
31+
32+
required:
33+
- compatible
34+
- reg
35+
36+
examples:
37+
- |
38+
# include <dt-bindings/interrupt-controller/irq.h>
39+
i2c {
40+
#address-cells = <1>;
41+
#size-cells = <0>;
42+
43+
accel@18 {
44+
compatible = "kionix,kxsd9";
45+
reg = <0x18>;
46+
iovdd-supply = <&iovdd>;
47+
vdd-supply = <&vdd>;
48+
interrupts = <57 IRQ_TYPE_EDGE_FALLING>;
49+
mount-matrix = "-0.984807753012208", "0", "-0.173648177666930",
50+
"0", "-1", "0",
51+
"-0.173648177666930", "0", "0.984807753012208";
52+
};
53+
};
54+
- |
55+
# include <dt-bindings/interrupt-controller/irq.h>
56+
spi {
57+
#address-cells = <1>;
58+
#size-cells = <0>;
59+
accel@0 {
60+
compatible = "kionix,kxsd9";
61+
reg = <0>;
62+
spi-max-frequency = <10000000>;
63+
};
64+
};
65+
...

Documentation/devicetree/bindings/iio/adc/ingenic,adc.txt

Lines changed: 0 additions & 49 deletions
This file was deleted.
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright 2019-2020 Artur Rojek
3+
%YAML 1.2
4+
---
5+
$id: "http://devicetree.org/schemas/iio/adc/ingenic,adc.yaml#"
6+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
7+
8+
title: Ingenic JZ47xx ADC controller IIO bindings
9+
10+
maintainers:
11+
- Artur Rojek <[email protected]>
12+
13+
description: >
14+
Industrial I/O subsystem bindings for ADC controller found in
15+
Ingenic JZ47xx SoCs.
16+
17+
ADC clients must use the format described in iio-bindings.txt, giving
18+
a phandle and IIO specifier pair ("io-channels") to the ADC controller.
19+
20+
properties:
21+
compatible:
22+
enum:
23+
- ingenic,jz4725b-adc
24+
- ingenic,jz4740-adc
25+
- ingenic,jz4770-adc
26+
27+
'#io-channel-cells':
28+
const: 1
29+
description:
30+
Must be set to <1> to indicate channels are selected by index.
31+
32+
reg:
33+
maxItems: 1
34+
35+
clocks:
36+
maxItems: 1
37+
38+
clock-names:
39+
items:
40+
- const: adc
41+
42+
interrupts:
43+
maxItems: 1
44+
45+
required:
46+
- compatible
47+
- '#io-channel-cells'
48+
- reg
49+
- clocks
50+
- clock-names
51+
- interrupts
52+
53+
additionalProperties: false
54+
55+
examples:
56+
- |
57+
#include <dt-bindings/clock/jz4740-cgu.h>
58+
#include <dt-bindings/iio/adc/ingenic,adc.h>
59+
60+
adc@10070000 {
61+
compatible = "ingenic,jz4740-adc";
62+
#io-channel-cells = <1>;
63+
64+
reg = <0x10070000 0x30>;
65+
66+
clocks = <&cgu JZ4740_CLK_ADC>;
67+
clock-names = "adc";
68+
69+
interrupt-parent = <&intc>;
70+
interrupts = <18>;
71+
};

0 commit comments

Comments
 (0)