Skip to content

Commit 2475c51

Browse files
committed
Merge tag 'staging-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging and IIO updates from Greg KH: "Here are the big staging/iio patches for 4.19-rc1. Lots of churn here, with tons of cleanups happening in staging drivers, a removal of an old crypto driver that no one was using (skein), and the addition of some new IIO drivers. Also added was a "gasket" driver from Google that needs loads of work and the erofs filesystem. Even with adding all of the new drivers and a new filesystem, we are only adding about 1000 lines overall to the kernel linecount, which shows just how much cleanup happened, and how big the unused crypto driver was. All of these have been in the linux-next tree for a while now with no reported issues" * tag 'staging-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (903 commits) staging:rtl8192u: Remove unused macro definitions - Style staging:rtl8192u: Add spaces around '+' operator - Style staging:rtl8192u: Remove stale comment - Style staging: rtl8188eu: remove unused mp_custom_oid.h staging: fbtft: Add spaces around / - Style staging: fbtft: Erases some repetitive usage of function name - Style staging: fbtft: Adjust some empty-line problems - Style staging: fbtft: Removes one nesting level to help readability - Style staging: fbtft: Changes gamma table to define. staging: fbtft: A bit more information on dev_err. staging: fbtft: Fixes some alignment issues - Style staging: fbtft: Puts macro arguments in parenthesis to avoid precedence issues - Style staging: rtl8188eu: remove unused array dB_Invert_Table staging: rtl8188eu: remove whitespace, add missing blank line staging: rtl8188eu: use is_multicast_ether_addr in rtw_sta_mgt.c staging: rtl8188eu: remove whitespace - style staging: rtl8188eu: cleanup block comment - style staging: rtl8188eu: use is_multicast_ether_addr in rtl8188eu_xmit.c staging: rtl8188eu: use is_multicast_ether_addr in recv_linux.c staging: rtlwifi: refactor rtl_get_tcb_desc ...
2 parents 336722e + e4f6a44 commit 2475c51

File tree

466 files changed

+28224
-27630
lines changed

Some content is hidden

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

466 files changed

+28224
-27630
lines changed

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,18 @@ Description:
197197
Angle of rotation. Units after application of scale and offset
198198
are radians.
199199

200+
What: /sys/bus/iio/devices/iio:deviceX/in_positionrelative_x_raw
201+
What: /sys/bus/iio/devices/iio:deviceX/in_positionrelative_y_raw
202+
KernelVersion: 4.18
203+
204+
Description:
205+
Relative position in direction x or y on a pad (may be
206+
arbitrarily assigned but should match other such assignments on
207+
device).
208+
Units after application of scale and offset are milli percents
209+
from the pad's size in both directions. Should be calibrated by
210+
the consumer.
211+
200212
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_x_raw
201213
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_y_raw
202214
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_z_raw
@@ -1295,13 +1307,16 @@ What: /sys/.../iio:deviceX/in_intensityY_raw
12951307
What: /sys/.../iio:deviceX/in_intensityY_ir_raw
12961308
What: /sys/.../iio:deviceX/in_intensityY_both_raw
12971309
What: /sys/.../iio:deviceX/in_intensityY_uv_raw
1310+
What: /sys/.../iio:deviceX/in_intensityY_duv_raw
12981311
KernelVersion: 3.4
12991312
13001313
Description:
13011314
Unit-less light intensity. Modifiers both and ir indicate
13021315
that measurements contain visible and infrared light
1303-
components or just infrared light, respectively. Modifier uv indicates
1304-
that measurements contain ultraviolet light components.
1316+
components or just infrared light, respectively. Modifier
1317+
uv indicates that measurements contain ultraviolet light
1318+
components. Modifier duv indicates that measurements
1319+
contain deep ultraviolet light components.
13051320

13061321
What: /sys/.../iio:deviceX/in_uvindex_input
13071322
KernelVersion: 4.6
@@ -1663,3 +1678,10 @@ KernelVersion: 4.12
16631678
16641679
Description:
16651680
Raw counter device counters direction for channel Y.
1681+
1682+
What: /sys/bus/iio/devices/iio:deviceX/in_phaseY_raw
1683+
KernelVersion: 4.18
1684+
1685+
Description:
1686+
Raw (unscaled) phase difference reading from channel Y
1687+
that can be processed to radians.
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_agc_gain
2+
What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_agc_gain_bias
3+
KernelVersion: 4.18
4+
5+
Description:
6+
This sensor has an automatic gain control (agc) loop
7+
which sets the analog signal levels at an optimum
8+
level by controlling programmable gain amplifiers. The
9+
criteria for optimal gain is determined by the sensor.
10+
11+
Return the actual gain value as an integer in [0; 65536]
12+
range when read from.
13+
14+
The agc gain read when measuring crosstalk shall be
15+
written into in_proximity0_agc_gain_bias.
16+
17+
What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calib_phase_temp_a
18+
What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calib_phase_temp_b
19+
What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calib_phase_light_a
20+
What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calib_phase_light_b
21+
KernelVersion: 4.18
22+
23+
Description:
24+
The sensor is able to perform correction of distance
25+
measurements due to changing temperature and ambient
26+
light conditions. It can be programmed to correct for
27+
a second order error polynomial.
28+
29+
Phase data has to be collected when temperature and
30+
ambient light are modulated independently.
31+
32+
Then a least squares curve fit to a second order
33+
polynomial has to be generated from the data. The
34+
resultant curves have the form ax^2 + bx + c.
35+
36+
From those two curves, a and b coefficients shall be
37+
stored in in_proximity0_calib_phase_temp_a and
38+
in_proximity0_calib_phase_temp_b for temperature and
39+
in in_proximity0_calib_phase_light_a and
40+
in_proximity0_calib_phase_light_b for ambient light.
41+
42+
Those values must be integer in [0; 8355840] range.
43+
44+
Finally, the c constant is set by the sensor
45+
internally.
46+
47+
The value stored in sensor is displayed when read from.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ir_small_raw
2+
KernelVersion: 4.18
3+
4+
Description:
5+
Unit-less infrared intensity. The intensity is measured from 1
6+
dark photodiode. "small" indicate the surface area capturing
7+
infrared.
8+
9+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ir_large_raw
10+
KernelVersion: 4.18
11+
12+
Description:
13+
Unit-less infrared intensity. The intensity is measured from 4
14+
dark photodiodes. "large" indicate the surface area capturing
15+
infrared.
16+
17+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_large_raw
18+
KernelVersion: 4.18
19+
20+
Description:
21+
Unit-less light intensity with more diodes.
22+

Documentation/devicetree/bindings/iio/accel/adxl345.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
Analog Devices ADXL345 3-Axis, +/-(2g/4g/8g/16g) Digital Accelerometer
1+
Analog Devices ADXL345/ADXL375 3-Axis Digital Accelerometers
22

33
http://www.analog.com/en/products/mems/accelerometers/adxl345.html
4+
http://www.analog.com/en/products/sensors-mems/accelerometers/adxl375.html
45

56
Required properties:
6-
- compatible : should be "adi,adxl345"
7+
- compatible : should be one of
8+
"adi,adxl345"
9+
"adi,adxl375"
710
- reg : the I2C address or SPI chip select number of the sensor
811

912
Required properties for SPI bus usage:

Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Required properties:
44
- compatible: depending on the SoC this should be one of:
55
- "amlogic,meson8-saradc" for Meson8
66
- "amlogic,meson8b-saradc" for Meson8b
7+
- "amlogic,meson8m2-saradc" for Meson8m2
78
- "amlogic,meson-gxbb-saradc" for GXBB
89
- "amlogic,meson-gxl-saradc" for GXL
910
- "amlogic,meson-gxm-saradc" for GXM

Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ Optional properties:
2121
- dmas: Phandle to dma channel for the ADC.
2222
- dma-names: Must be "rx" when dmas property is being used.
2323
See ../../dma/dma.txt for details.
24+
- #io-channel-cells: in case consumer drivers are attached, this must be 1.
25+
See <Documentation/devicetree/bindings/iio/iio-bindings.txt> for details.
26+
27+
Properties for consumer drivers:
28+
- Consumer drivers can be connected to this producer device, as specified
29+
in <Documentation/devicetree/bindings/iio/iio-bindings.txt>
30+
- Channels exposed are specified in:
31+
<dt-bindings/iio/adc/at91-sama5d2_adc.txt>
2432

2533
Example:
2634

@@ -38,4 +46,5 @@ adc: adc@fc030000 {
3846
atmel,trigger-edge-type = <IRQ_TYPE_EDGE_BOTH>;
3947
dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | AT91_XDMAC_DT_PERID(25))>;
4048
dma-names = "rx";
49+
#io-channel-cells = <1>;
4150
}

Documentation/devicetree/bindings/iio/adc/avia-hx711.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,17 @@ Required properties:
88
See Documentation/devicetree/bindings/gpio/gpio.txt
99
- avdd-supply: Definition of the regulator used as analog supply
1010

11+
Optional properties:
12+
- clock-frequency: Frequency of PD_SCK in Hz
13+
Minimum value allowed is 10 kHz because of maximum
14+
high time of 50 microseconds.
15+
1116
Example:
12-
weight@0 {
17+
weight {
1318
compatible = "avia,hx711";
1419
sck-gpios = <&gpio3 10 GPIO_ACTIVE_HIGH>;
1520
dout-gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
1621
avdd-suppy = <&avdd>;
22+
clock-frequency = <100000>;
1723
};
1824

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Required properties:
77

88
Example node:
99

10-
ads1202: adc@0 {
10+
ads1202: adc {
1111
compatible = "sd-modulator";
1212
#io-channel-cells = <0>;
1313
};
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
Spreadtrum SC27XX series PMICs ADC binding
2+
3+
Required properties:
4+
- compatible: Should be one of the following.
5+
"sprd,sc2720-adc"
6+
"sprd,sc2721-adc"
7+
"sprd,sc2723-adc"
8+
"sprd,sc2730-adc"
9+
"sprd,sc2731-adc"
10+
- reg: The address offset of ADC controller.
11+
- interrupt-parent: The interrupt controller.
12+
- interrupts: The interrupt number for the ADC device.
13+
- #io-channel-cells: Number of cells in an IIO specifier.
14+
- hwlocks: Reference to a phandle of a hwlock provider node.
15+
16+
Example:
17+
18+
sc2731_pmic: pmic@0 {
19+
compatible = "sprd,sc2731";
20+
reg = <0>;
21+
spi-max-frequency = <26000000>;
22+
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
23+
interrupt-controller;
24+
#interrupt-cells = <2>;
25+
#address-cells = <1>;
26+
#size-cells = <0>;
27+
28+
pmic_adc: adc@480 {
29+
compatible = "sprd,sc2731-adc";
30+
reg = <0x480>;
31+
interrupt-parent = <&sc2731_pmic>;
32+
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
33+
#io-channel-cells = <1>;
34+
hwlocks = <&hwlock 4>;
35+
};
36+
};
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
Analog Devices AD5758 DAC device driver
2+
3+
Required properties for the AD5758:
4+
- compatible: Must be "adi,ad5758"
5+
- reg: SPI chip select number for the device
6+
- spi-max-frequency: Max SPI frequency to use (< 50000000)
7+
- spi-cpha: is the only mode that is supported
8+
9+
Required properties:
10+
11+
- adi,dc-dc-mode: Mode of operation of the dc-to-dc converter
12+
Dynamic Power Control (DPC)
13+
In this mode, the AD5758 circuitry senses the output
14+
voltage and dynamically regulates the supply voltage,
15+
VDPC+, to meet compliance requirements plus an optimized
16+
headroom voltage for the output buffer.
17+
18+
Programmable Power Control (PPC)
19+
In this mode, the VDPC+ voltage is user-programmable to
20+
a fixed level that needs to accommodate the maximum output
21+
load required.
22+
23+
The output of the DAC core is either converted to a
24+
current or voltage output at the VIOUT pin. Only one mode
25+
can be enabled at any one time.
26+
27+
The following values are currently supported:
28+
* 1: DPC current mode
29+
* 2: DPC voltage mode
30+
* 3: PPC current mode
31+
32+
Depending on the selected output mode (voltage or current) one of the
33+
two properties must
34+
be present:
35+
36+
- adi,range-microvolt: Voltage output range
37+
The array of voltage output ranges must contain two fields:
38+
* <0 5000000>: 0 V to 5 V voltage range
39+
* <0 10000000>: 0 V to 10 V voltage range
40+
* <(-5000000) 5000000>: ±5 V voltage range
41+
* <(-10000000) 10000000>: ±10 V voltage range
42+
- adi,range-microamp: Current output range
43+
The array of current output ranges must contain two fields:
44+
* <0 20000>: 0 mA to 20 mA current range
45+
* <0 24000>: 0 mA to 24 mA current range
46+
* <4 24000>: 4 mA to 20 mA current range
47+
* <(-20000) 20000>: ±20 mA current range
48+
* <(-24000) 24000>: ±24 mA current range
49+
* <(-1000) 22000>: −1 mA to +22 mA current range
50+
51+
Optional properties:
52+
53+
- adi,dc-dc-ilim-microamp: The dc-to-dc converter current limit
54+
The following values are currently supported [uA]:
55+
* 150000
56+
* 200000
57+
* 250000
58+
* 300000
59+
* 350000
60+
* 400000
61+
62+
- adi,slew-time-us: The time it takes for the output to reach the
63+
full scale [uS]
64+
The supported range is between 133us up to 1023984375us
65+
66+
AD5758 Example:
67+
68+
dac@0 {
69+
compatible = "adi,ad5758";
70+
reg = <0>;
71+
spi-max-frequency = <1000000>;
72+
spi-cpha;
73+
74+
adi,dc-dc-mode = <2>;
75+
adi,range-microvolt = <0 10000000>;
76+
adi,dc-dc-ilim-microamp = <200000>;
77+
adi,slew-time-us = <125000>;
78+
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Required properties:
66
- compatible : should be one of
77
"invensense,mpu6050"
88
"invensense,mpu6500"
9+
"invensense,mpu6515"
910
"invensense,mpu9150"
1011
"invensense,mpu9250"
1112
"invensense,mpu9255"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
* ISL29501 Time-of-flight sensor.
2+
3+
Required properties:
4+
5+
- compatible : should be "renesas,isl29501"
6+
- reg : the I2C address of the sensor
7+
8+
Example:
9+
10+
isl29501@57 {
11+
compatible = "renesas,isl29501";
12+
reg = <0x57>;
13+
};

Documentation/devicetree/bindings/iio/pressure/bmp085.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ Required properties:
88
"bosch,bme280"
99

1010
Optional properties:
11-
- chip-id: configurable chip id for non-default chip revisions
12-
- temp-measurement-period: temperature measurement period (milliseconds)
13-
- default-oversampling: default oversampling value to be used at startup,
14-
value range is 0-3 with rising sensitivity.
1511
- interrupts: interrupt mapping for IRQ
1612
- reset-gpios: a GPIO line handling reset of the sensor: as the line is
1713
active low, it should be marked GPIO_ACTIVE_LOW (see gpio/gpio.txt)
@@ -23,9 +19,6 @@ Example:
2319
pressure@77 {
2420
compatible = "bosch,bmp085";
2521
reg = <0x77>;
26-
chip-id = <10>;
27-
temp-measurement-period = <100>;
28-
default-oversampling = <2>;
2922
interrupt-parent = <&gpio0>;
3023
interrupts = <25 IRQ_TYPE_EDGE_RISING>;
3124
reset-gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Generic resistive touchscreen ADC
2+
3+
Required properties:
4+
5+
- compatible: must be "resistive-adc-touch"
6+
The device must be connected to an ADC device that provides channels for
7+
position measurement and optional pressure.
8+
Refer to ../iio/iio-bindings.txt for details
9+
- iio-channels: must have at least two channels connected to an ADC device.
10+
These should correspond to the channels exposed by the ADC device and should
11+
have the right index as the ADC device registers them. These channels
12+
represent the relative position on the "x" and "y" axes.
13+
- iio-channel-names: must have all the channels' names. Mandatory channels
14+
are "x" and "y".
15+
16+
Optional properties:
17+
- iio-channels: The third channel named "pressure" is optional and can be
18+
used if the ADC device also measures pressure besides position.
19+
If this channel is missing, pressure will be ignored and the touchscreen
20+
will only report position.
21+
- iio-channel-names: optional channel named "pressure".
22+
23+
Example:
24+
25+
resistive_touch: resistive_touch {
26+
compatible = "resistive-adc-touch";
27+
touchscreen-min-pressure = <50000>;
28+
io-channels = <&adc 24>, <&adc 25>, <&adc 26>;
29+
io-channel-names = "x", "y", "pressure";
30+
};

Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ Optional properties for Touchscreens:
77
(in pixels)
88
- touchscreen-max-pressure : maximum reported pressure (arbitrary range
99
dependent on the controller)
10+
- touchscreen-min-pressure : minimum pressure on the touchscreen to be
11+
achieved in order for the touchscreen
12+
driver to report a touch event.
1013
- touchscreen-fuzz-x : horizontal noise value of the absolute input
1114
device (in pixels)
1215
- touchscreen-fuzz-y : vertical noise value of the absolute input

0 commit comments

Comments
 (0)