Skip to content

Commit 738b04f

Browse files
torvaldstorvalds
committed
Merge tag 'staging-4.20-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 staging and IIO driver pull request for 4.20-rc1. There are lots of things here, we ended up adding more lines than removing, thanks to a large influx of Comedi National Instrument device support. Someday soon we need to get comedi out of staging... Other than the comedi drivers, the "big" things here are: - new iio drivers - delete dgnc driver (no one used it and no one had the hardware anymore) - vbox driver updates and fixes - erofs fixes - tons and tons of tiny checkpatch fixes for almost all staging drivers All of these have been in linux-next, with the last few happening a bit "late" due to them getting stuck on my laptop during travel to the Mantainers summit" * tag 'staging-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (690 commits) staging: gasket: Fix sparse "incorrect type in assignment" warnings. staging: gasket: remove debug logs for callback invocation staging: gasket: remove debug logs in page table mapping calls staging: rtl8188eu: core: Use sizeof(*p) instead of sizeof(struct P) for memory allocation staging: ks7010: Remove extra blank line staging: gasket: Remove extra blank line staging: media: davinci_vpfe: Fix spelling mistake in enum staging: speakup: Add a pair of braces staging: wlan-ng: Replace long int with long staging: MAINTAINERS: remove obsolete IPX staging directory staging: MAINTAINERS: remove NCP filesystem entry staging: rtl8188eu: cleanup comparsions to false staging: gasket: Update device virtual address comment staging: gasket: sysfs: fix attribute release comment staging: gasket: apex: fix sysfs_show staging: gasket: page_table: simplify gasket_components_to_dev_address staging: gasket: page_table: fix comment in components_to_dev_address staging: gasket: page table: fixup error path allocating coherent mem staging: gasket: page_table: rearrange gasket_page_table_entry staging: gasket: page_table: remove unnecessary PTE status set to free ...
2 parents fe675d4 + 4ab7e05 commit 738b04f

File tree

485 files changed

+44060
-16309
lines changed

Some content is hidden

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

485 files changed

+44060
-16309
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ Description:
199199

200200
What: /sys/bus/iio/devices/iio:deviceX/in_positionrelative_x_raw
201201
What: /sys/bus/iio/devices/iio:deviceX/in_positionrelative_y_raw
202-
KernelVersion: 4.18
202+
KernelVersion: 4.19
203203
Contact: linux-iio@vger.kernel.org
204204
Description:
205205
Relative position in direction x or y on a pad (may be

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
Analog Devices ADXL372 3-Axis, +/-(200g) Digital Accelerometer
2+
3+
http://www.analog.com/media/en/technical-documentation/data-sheets/adxl372.pdf
4+
5+
Required properties:
6+
- compatible : should be "adi,adxl372"
7+
- reg: the I2C address or SPI chip select number for the device
8+
9+
Required properties for SPI bus usage:
10+
- spi-max-frequency: Max SPI frequency to use
11+
12+
Optional properties:
13+
- interrupts: interrupt mapping for IRQ as documented in
14+
Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
15+
16+
Example for a I2C device node:
17+
18+
accelerometer@53 {
19+
compatible = "adi,adxl372";
20+
reg = <0x53>;
21+
interrupt-parent = <&gpio>;
22+
interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
23+
};
24+
25+
Example for a SPI device node:
26+
27+
accelerometer@0 {
28+
compatible = "adi,adxl372";
29+
reg = <0>;
30+
spi-max-frequency = <1000000>;
31+
interrupt-parent = <&gpio>;
32+
interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
33+
};

‎Documentation/devicetree/bindings/iio/adc/mcp3911.txt

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
* Microchip MCP3911 Dual channel analog front end (ADC)
2+
3+
Required properties:
4+
- compatible: Should be "microchip,mcp3911"
5+
- reg: SPI chip select number for the device
6+
7+
Recommended properties:
8+
- spi-max-frequency: Definition as per
9+
Documentation/devicetree/bindings/spi/spi-bus.txt.
10+
Max frequency for this chip is 20MHz.
11+
12+
Optional properties:
13+
- clocks: Phandle and clock identifier for sampling clock
14+
- interrupt-parent: Phandle to the parent interrupt controller
15+
- interrupts: IRQ line for the ADC
16+
- microchip,device-addr: Device address when multiple MCP3911 chips are present on the
17+
same SPI bus. Valid values are 0-3. Defaults to 0.
18+
- vref-supply: Phandle to the external reference voltage supply.
19+
20+
Example:
21+
adc@0 {
22+
compatible = "microchip,mcp3911";
23+
reg = <0>;
24+
interrupt-parent = <&gpio5>;
25+
interrupts = <15 IRQ_TYPE_EDGE_RISING>;
26+
spi-max-frequency = <20000000>;
27+
microchip,device-addr = <0>;
28+
vref-supply = <&vref_reg>;
29+
clocks = <&xtal>;
30+
};

‎Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt

Lines changed: 60 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
1-
Qualcomm's SPMI PMIC voltage ADC
1+
Qualcomm's SPMI PMIC ADC
22

3-
SPMI PMIC voltage ADC (VADC) provides interface to clients to read
4-
voltage. The VADC is a 15-bit sigma-delta ADC.
3+
- SPMI PMIC voltage ADC (VADC) provides interface to clients to read
4+
voltage. The VADC is a 15-bit sigma-delta ADC.
5+
- SPMI PMIC5 voltage ADC (ADC) provides interface to clients to read
6+
voltage. The VADC is a 16-bit sigma-delta ADC.
57

68
VADC node:
79

810
- compatible:
911
Usage: required
1012
Value type: <string>
1113
Definition: Should contain "qcom,spmi-vadc".
14+
Should contain "qcom,spmi-adc5" for PMIC5 ADC driver.
15+
Should contain "qcom,spmi-adc-rev2" for PMIC rev2 ADC driver.
1216

1317
- reg:
1418
Usage: required
1519
Value type: <prop-encoded-array>
16-
Definition: VADC base address and length in the SPMI PMIC register map.
20+
Definition: VADC base address in the SPMI PMIC register map.
1721

1822
- #address-cells:
1923
Usage: required
@@ -45,13 +49,26 @@ Channel node properties:
4549
Definition: ADC channel number.
4650
See include/dt-bindings/iio/qcom,spmi-vadc.h
4751

52+
- label:
53+
Usage: required for "qcom,spmi-adc5" and "qcom,spmi-adc-rev2"
54+
Value type: <empty>
55+
Definition: ADC input of the platform as seen in the schematics.
56+
For thermistor inputs connected to generic AMUX or GPIO inputs
57+
these can vary across platform for the same pins. Hence select
58+
the platform schematics name for this channel.
59+
4860
- qcom,decimation:
4961
Usage: optional
5062
Value type: <u32>
5163
Definition: This parameter is used to decrease ADC sampling rate.
5264
Quicker measurements can be made by reducing decimation ratio.
53-
Valid values are 512, 1024, 2048, 4096.
54-
If property is not found, default value of 512 will be used.
65+
- For compatible property "qcom,spmi-vadc", valid values are
66+
512, 1024, 2048, 4096. If property is not found, default value
67+
of 512 will be used.
68+
- For compatible property "qcom,spmi-adc5", valid values are 250, 420
69+
and 840. If property is not found, default value of 840 is used.
70+
- For compatible property "qcom,spmi-adc-rev2", valid values are 256,
71+
512 and 1024. If property is not present, default value is 1024.
5572

5673
- qcom,pre-scaling:
5774
Usage: optional
@@ -66,21 +83,38 @@ Channel node properties:
6683
- qcom,ratiometric:
6784
Usage: optional
6885
Value type: <empty>
69-
Definition: Channel calibration type. If this property is specified
70-
VADC will use the VDD reference (1.8V) and GND for channel
71-
calibration. If property is not found, channel will be
72-
calibrated with 0.625V and 1.25V reference channels, also
73-
known as absolute calibration.
86+
Definition: Channel calibration type.
87+
- For compatible property "qcom,spmi-vadc", if this property is
88+
specified VADC will use the VDD reference (1.8V) and GND for
89+
channel calibration. If property is not found, channel will be
90+
calibrated with 0.625V and 1.25V reference channels, also
91+
known as absolute calibration.
92+
- For compatible property "qcom,spmi-adc5" and "qcom,spmi-adc-rev2",
93+
if this property is specified VADC will use the VDD reference
94+
(1.875V) and GND for channel calibration. If property is not found,
95+
channel will be calibrated with 0V and 1.25V reference channels,
96+
also known as absolute calibration.
7497

7598
- qcom,hw-settle-time:
7699
Usage: optional
77100
Value type: <u32>
78101
Definition: Time between AMUX getting configured and the ADC starting
79-
conversion. Delay = 100us * (value) for value < 11, and
80-
2ms * (value - 10) otherwise.
81-
Valid values are: 0, 100, 200, 300, 400, 500, 600, 700, 800,
82-
900 us and 1, 2, 4, 6, 8, 10 ms
83-
If property is not found, channel will use 0us.
102+
conversion. The 'hw_settle_time' is an index used from valid values
103+
and programmed in hardware to achieve the hardware settling delay.
104+
- For compatible property "qcom,spmi-vadc" and "qcom,spmi-adc-rev2",
105+
Delay = 100us * (hw_settle_time) for hw_settle_time < 11,
106+
and 2ms * (hw_settle_time - 10) otherwise.
107+
Valid values are: 0, 100, 200, 300, 400, 500, 600, 700, 800,
108+
900 us and 1, 2, 4, 6, 8, 10 ms.
109+
If property is not found, channel will use 0us.
110+
- For compatible property "qcom,spmi-adc5", delay = 15us for
111+
value 0, 100us * (value) for values < 11,
112+
and 2ms * (value - 10) otherwise.
113+
Valid values are: 15, 100, 200, 300, 400, 500, 600, 700, 800,
114+
900 us and 1, 2, 4, 6, 8, 10 ms
115+
Certain controller digital versions have valid values of
116+
15, 100, 200, 300, 400, 500, 600, 700, 1, 2, 4, 8, 16, 32, 64, 128 ms
117+
If property is not found, channel will use 15us.
84118

85119
- qcom,avg-samples:
86120
Usage: optional
@@ -89,13 +123,18 @@ Channel node properties:
89123
Averaging provides the option to obtain a single measurement
90124
from the ADC that is an average of multiple samples. The value
91125
selected is 2^(value).
92-
Valid values are: 1, 2, 4, 8, 16, 32, 64, 128, 256, 512
93-
If property is not found, 1 sample will be used.
126+
- For compatible property "qcom,spmi-vadc", valid values
127+
are: 1, 2, 4, 8, 16, 32, 64, 128, 256, 512
128+
If property is not found, 1 sample will be used.
129+
- For compatible property "qcom,spmi-adc5" and "qcom,spmi-adc-rev2",
130+
valid values are: 1, 2, 4, 8, 16
131+
If property is not found, 1 sample will be used.
94132

95133
NOTE:
96134

97-
Following channels, also known as reference point channels, are used for
98-
result calibration and their channel configuration nodes should be defined:
135+
For compatible property "qcom,spmi-vadc" following channels, also known as
136+
reference point channels, are used for result calibration and their channel
137+
configuration nodes should be defined:
99138
VADC_REF_625MV and/or VADC_SPARE1(based on PMIC version) VADC_REF_1250MV,
100139
VADC_GND_REF and VADC_VDD_VADC.
101140

@@ -104,7 +143,7 @@ Example:
104143
/* VADC node */
105144
pmic_vadc: vadc@3100 {
106145
compatible = "qcom,spmi-vadc";
107-
reg = <0x3100 0x100>;
146+
reg = <0x3100>;
108147
interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
109148
#address-cells = <1>;
110149
#size-cells = <0>;

‎Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Required properties:
1212
- interrupts: The interrupt number for the ADC device.
1313
- #io-channel-cells: Number of cells in an IIO specifier.
1414
- hwlocks: Reference to a phandle of a hwlock provider node.
15+
- nvmem-cells: A phandle to the calibration cells provided by eFuse device.
16+
- nvmem-cell-names: Should be "big_scale_calib", "small_scale_calib".
1517

1618
Example:
1719

@@ -32,5 +34,7 @@ Example:
3234
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
3335
#io-channel-cells = <1>;
3436
hwlocks = <&hwlock 4>;
37+
nvmem-cells = <&adc_big_scale>, <&adc_small_scale>;
38+
nvmem-cell-names = "big_scale_calib", "small_scale_calib";
3539
};
3640
};

‎Documentation/devicetree/bindings/iio/dac/ad5758.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ Required properties:
5050

5151
Optional properties:
5252

53+
- reset-gpios : GPIO spec for the RESET pin. If specified, it will be
54+
asserted during driver probe.
55+
5356
- adi,dc-dc-ilim-microamp: The dc-to-dc converter current limit
5457
The following values are currently supported [uA]:
5558
* 150000
@@ -71,6 +74,8 @@ AD5758 Example:
7174
spi-max-frequency = <1000000>;
7275
spi-cpha;
7376

77+
reset-gpios = <&gpio 22 0>;
78+
7479
adi,dc-dc-mode = <2>;
7580
adi,range-microvolt = <0 10000000>;
7681
adi,dc-dc-ilim-microamp = <200000>;

‎Documentation/devicetree/bindings/iio/dac/ltc1660.txt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
* Linear Technology Micropower octal 8-Bit and 10-Bit DACs
2+
3+
Required properties:
4+
- compatible: Must be one of the following:
5+
"lltc,ltc1660"
6+
"lltc,ltc1665"
7+
- reg: SPI chip select number for the device
8+
- vref-supply: Phandle to the voltage reference supply
9+
10+
Recommended properties:
11+
- spi-max-frequency: Definition as per
12+
Documentation/devicetree/bindings/spi/spi-bus.txt.
13+
Max frequency for this chip is 5 MHz.
14+
15+
Example:
16+
dac@0 {
17+
compatible = "lltc,ltc1660";
18+
reg = <0>;
19+
spi-max-frequency = <5000000>;
20+
vref-supply = <&vref_reg>;
21+
};

‎Documentation/devicetree/bindings/iio/imu/inv_mpu6050.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Required properties:
2020
bindings.
2121

2222
Optional properties:
23+
- vddio-supply: regulator phandle for VDDIO supply
2324
- mount-matrix: an optional 3x3 mounting rotation matrix
2425
- i2c-gate node. These devices also support an auxiliary i2c bus. This is
2526
simple enough to be described using the i2c-gate binding. See

‎Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Required properties:
77
"st,lsm6dsl"
88
"st,lsm6dsm"
99
"st,ism330dlc"
10+
"st,lsm6dso"
1011
- reg: i2c address of the sensor / spi cs line
1112

1213
Optional properties:

‎Documentation/devicetree/bindings/iio/light/bh1750.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
ROHM BH1750 - ALS, Ambient light sensor
2+
3+
Required properties:
4+
5+
- compatible: Must be one of:
6+
"rohm,bh1710"
7+
"rohm,bh1715"
8+
"rohm,bh1721"
9+
"rohm,bh1750"
10+
"rohm,bh1751"
11+
- reg: the I2C address of the sensor
12+
13+
Example:
14+
15+
light-sensor@23 {
16+
compatible = "rohm,bh1750";
17+
reg = <0x23>;
18+
};

0 commit comments

Comments
 (0)