Skip to content

Commit 0dd09bc

Browse files
committed
Merge tag 'staging-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging / iio updates from Greg KH: "Here is the big staging and iio set of patches for the 5.5-rc1 release. It's the usual huge collection of cleanup patches all over the drivers/staging/ area, along with a new staging driver, and a bunch of new IIO drivers as well. Full details are in the shortlog, but all of these have been in linux-next for a long time with no reported issues" * tag 'staging-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (548 commits) staging: vchiq: Have vchiq_dump_* functions return an error code staging: vchiq: Refactor indentation in vchiq_dump_* functions staging: fwserial: Fix Kconfig indentation (seven spaces) staging: vchiq_dump: Replace min with min_t staging: vchiq: Fix block comment format in vchiq_dump() staging: octeon: indent with tabs instead of spaces staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error staging: most: core: remove sysfs attr remove_link staging: vc04: Fix Kconfig indentation staging: pi433: Fix Kconfig indentation staging: nvec: Fix Kconfig indentation staging: most: Fix Kconfig indentation staging: fwserial: Fix Kconfig indentation staging: fbtft: Fix Kconfig indentation fbtft: Drop OF dependency fbtft: Make use of device property API fbtft: Drop useless #ifdef CONFIG_OF and dead code fbtft: Describe function parameters in kernel-doc fbtft: Make sure string is NULL terminated staging: rtl8723bs: remove set but not used variable 'change', 'pos' ...
2 parents 8f56e4e + 0f6f874 commit 0dd09bc

File tree

393 files changed

+24725
-9463
lines changed

Some content is hidden

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

393 files changed

+24725
-9463
lines changed

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,8 @@ What: /sys/.../events/in_illuminance0_thresh_falling_value
753753
what: /sys/.../events/in_illuminance0_thresh_rising_value
754754
what: /sys/.../events/in_proximity0_thresh_falling_value
755755
what: /sys/.../events/in_proximity0_thresh_rising_value
756+
What: /sys/.../events/in_illuminance_thresh_rising_value
757+
What: /sys/.../events/in_illuminance_thresh_falling_value
756758
KernelVersion: 2.6.37
757759
758760
Description:
@@ -972,6 +974,7 @@ What: /sys/.../events/in_activity_jogging_thresh_rising_period
972974
What: /sys/.../events/in_activity_jogging_thresh_falling_period
973975
What: /sys/.../events/in_activity_running_thresh_rising_period
974976
What: /sys/.../events/in_activity_running_thresh_falling_period
977+
What: /sys/.../events/in_illuminance_thresh_either_period
975978
KernelVersion: 2.6.37
976979
977980
Description:
@@ -1715,3 +1718,11 @@ Description:
17151718
Mass concentration reading of particulate matter in ug / m3.
17161719
pmX consists of particles with aerodynamic diameter less or
17171720
equal to X micrometers.
1721+
1722+
What: /sys/bus/iio/devices/iio:deviceX/events/in_illuminance_period_available
1723+
Date: November 2019
1724+
KernelVersion: 5.4
1725+
1726+
Description:
1727+
List of valid periods (in seconds) for which the light intensity
1728+
must be above the threshold level before interrupt is asserted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/ac_excitation_en
2+
KernelVersion:
3+
4+
Description:
5+
Reading gives the state of AC excitation.
6+
Writing '1' enables AC excitation.
7+
8+
What: /sys/bus/iio/devices/iio:deviceX/bridge_switch_en
9+
KernelVersion:
10+
11+
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.
16+
17+
What: /sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration
18+
KernelVersion:
19+
20+
Description:
21+
Initiates the system calibration procedure. This is done on a
22+
single channel at a time. Write '1' to start the calibration.
23+
24+
What: /sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration_mode_available
25+
KernelVersion:
26+
27+
Description:
28+
Reading returns a list with the possible calibration modes.
29+
There are two available options:
30+
"zero_scale" - calibrate to zero scale
31+
"full_scale" - calibrate to full scale
32+
33+
What: /sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration_mode
34+
KernelVersion:
35+
36+
Description:
37+
Sets up the calibration mode used in the system calibration
38+
procedure. Reading returns the current calibration mode.
39+
Writing sets the system calibration mode.
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
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/counter/ti-eqep.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Texas Instruments Enhanced Quadrature Encoder Pulse (eQEP) Module
8+
9+
maintainers:
10+
- David Lechner <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: ti,am3352-eqep
15+
16+
reg:
17+
maxItems: 1
18+
19+
interrupts:
20+
description: The eQEP event interrupt
21+
maxItems: 1
22+
23+
clocks:
24+
description: The clock that determines the SYSCLKOUT rate for the eQEP
25+
peripheral.
26+
maxItems: 1
27+
28+
clock-names:
29+
const: sysclkout
30+
31+
required:
32+
- compatible
33+
- reg
34+
- interrupts
35+
- clocks
36+
- clock-names
37+
38+
additionalProperties: false
39+
40+
examples:
41+
- |
42+
eqep0: counter@180 {
43+
compatible = "ti,am3352-eqep";
44+
reg = <0x180 0x80>;
45+
clocks = <&l4ls_gclk>;
46+
clock-names = "sysclkout";
47+
interrupts = <79>;
48+
};
49+
50+
...
Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/adc/adi,ad7292.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices AD7292 10-Bit Monitor and Control System
8+
9+
maintainers:
10+
- Marcelo Schmitt <[email protected]>
11+
12+
description: |
13+
Analog Devices AD7292 10-Bit Monitor and Control System with ADC, DACs,
14+
Temperature Sensor, and GPIOs
15+
16+
Specifications about the part can be found at:
17+
https://www.analog.com/media/en/technical-documentation/data-sheets/ad7292.pdf
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- adi,ad7292
23+
24+
reg:
25+
maxItems: 1
26+
27+
vref-supply:
28+
description: |
29+
The regulator supply for ADC and DAC reference voltage.
30+
31+
spi-cpha: true
32+
33+
'#address-cells':
34+
const: 1
35+
36+
'#size-cells':
37+
const: 0
38+
39+
required:
40+
- compatible
41+
- reg
42+
- spi-cpha
43+
44+
patternProperties:
45+
"^channel@[0-7]$":
46+
type: object
47+
description: |
48+
Represents the external channels which are connected to the ADC.
49+
See Documentation/devicetree/bindings/iio/adc/adc.txt.
50+
51+
properties:
52+
reg:
53+
description: |
54+
The channel number. It can have up to 8 channels numbered from 0 to 7.
55+
items:
56+
maximum: 7
57+
58+
diff-channels:
59+
description: see Documentation/devicetree/bindings/iio/adc/adc.txt
60+
maxItems: 1
61+
62+
required:
63+
- reg
64+
65+
examples:
66+
- |
67+
spi {
68+
#address-cells = <1>;
69+
#size-cells = <0>;
70+
71+
ad7292: adc@0 {
72+
compatible = "adi,ad7292";
73+
reg = <0>;
74+
spi-max-frequency = <25000000>;
75+
vref-supply = <&adc_vref>;
76+
spi-cpha;
77+
78+
#address-cells = <1>;
79+
#size-cells = <0>;
80+
81+
channel@0 {
82+
reg = <0>;
83+
diff-channels = <0 1>;
84+
};
85+
channel@2 {
86+
reg = <2>;
87+
};
88+
channel@3 {
89+
reg = <3>;
90+
};
91+
channel@4 {
92+
reg = <4>;
93+
};
94+
channel@5 {
95+
reg = <5>;
96+
};
97+
channel@6 {
98+
reg = <6>;
99+
};
100+
channel@7 {
101+
reg = <7>;
102+
};
103+
};
104+
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Required properties:
55
- compatible: Should be one of:
66
* ingenic,jz4725b-adc
77
* ingenic,jz4740-adc
8+
* ingenic,jz4770-adc
89
- reg: ADC controller registers location and length.
910
- clocks: phandle to the SoC's ADC clock.
1011
- clock-names: Must be set to "adc".

Documentation/devicetree/bindings/iio/adc/max1027-adc.txt

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

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

Lines changed: 0 additions & 30 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 Marcus Folkesson <[email protected]>
3+
%YAML 1.2
4+
---
5+
$id: "http://devicetree.org/schemas/bindings/iio/adc/microchip,mcp3911.yaml#"
6+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
7+
8+
title: Microchip MCP3911 Dual channel analog front end (ADC)
9+
10+
maintainers:
11+
- Marcus Folkesson <[email protected]>
12+
- Kent Gustavsson <[email protected]>
13+
14+
description: |
15+
Bindings for the Microchip MCP3911 Dual channel ADC device. Datasheet can be
16+
found here: https://ww1.microchip.com/downloads/en/DeviceDoc/20002286C.pdf
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- microchip,mcp3911
22+
23+
reg:
24+
maxItems: 1
25+
26+
spi-max-frequency:
27+
maximum: 20000000
28+
29+
clocks:
30+
description: |
31+
Phandle and clock identifier for external sampling clock.
32+
If not specified, the internal crystal oscillator will be used.
33+
maxItems: 1
34+
35+
interrupts:
36+
description: IRQ line of the ADC
37+
maxItems: 1
38+
39+
microchip,device-addr:
40+
description: Device address when multiple MCP3911 chips are present on the same SPI bus.
41+
allOf:
42+
- $ref: /schemas/types.yaml#/definitions/uint32
43+
- enum: [0, 1, 2, 3]
44+
- default: 0
45+
46+
vref-supply:
47+
description: |
48+
Phandle to the external reference voltage supply.
49+
If not specified, the internal voltage reference (1.2V) will be used.
50+
51+
required:
52+
- compatible
53+
- reg
54+
55+
examples:
56+
- |
57+
spi {
58+
#address-cells = <1>;
59+
#size-cells = <0>;
60+
61+
adc@0 {
62+
compatible = "microchip,mcp3911";
63+
reg = <0>;
64+
interrupt-parent = <&gpio5>;
65+
interrupts = <15 2>;
66+
spi-max-frequency = <20000000>;
67+
microchip,device-addr = <0>;
68+
vref-supply = <&vref_reg>;
69+
clocks = <&xtal>;
70+
};
71+
};

Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ Optional properties:
5353
analog input switches on stm32mp1.
5454
- st,syscfg: Phandle to system configuration controller. It can be used to
5555
control the analog circuitry on stm32mp1.
56+
- st,max-clk-rate-hz: Allow to specify desired max clock rate used by analog
57+
circuitry.
5658

5759
Contents of a stm32 adc child node:
5860
-----------------------------------

0 commit comments

Comments
 (0)