forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'staging-5.5-rc1' of git://git.kernel.org/pub/scm/linux/ker…
…nel/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' ...
- Loading branch information
Showing
393 changed files
with
24,725 additions
and
9,463 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -753,6 +753,8 @@ What: /sys/.../events/in_illuminance0_thresh_falling_value | |
what: /sys/.../events/in_illuminance0_thresh_rising_value | ||
what: /sys/.../events/in_proximity0_thresh_falling_value | ||
what: /sys/.../events/in_proximity0_thresh_rising_value | ||
What: /sys/.../events/in_illuminance_thresh_rising_value | ||
What: /sys/.../events/in_illuminance_thresh_falling_value | ||
KernelVersion: 2.6.37 | ||
Contact: [email protected] | ||
Description: | ||
|
@@ -972,6 +974,7 @@ What: /sys/.../events/in_activity_jogging_thresh_rising_period | |
What: /sys/.../events/in_activity_jogging_thresh_falling_period | ||
What: /sys/.../events/in_activity_running_thresh_rising_period | ||
What: /sys/.../events/in_activity_running_thresh_falling_period | ||
What: /sys/.../events/in_illuminance_thresh_either_period | ||
KernelVersion: 2.6.37 | ||
Contact: [email protected] | ||
Description: | ||
|
@@ -1715,3 +1718,11 @@ Description: | |
Mass concentration reading of particulate matter in ug / m3. | ||
pmX consists of particles with aerodynamic diameter less or | ||
equal to X micrometers. | ||
|
||
What: /sys/bus/iio/devices/iio:deviceX/events/in_illuminance_period_available | ||
Date: November 2019 | ||
KernelVersion: 5.4 | ||
Contact: [email protected] | ||
Description: | ||
List of valid periods (in seconds) for which the light intensity | ||
must be above the threshold level before interrupt is asserted. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
What: /sys/bus/iio/devices/iio:deviceX/ac_excitation_en | ||
KernelVersion: | ||
Contact: [email protected] | ||
Description: | ||
Reading gives the state of AC excitation. | ||
Writing '1' enables AC excitation. | ||
|
||
What: /sys/bus/iio/devices/iio:deviceX/bridge_switch_en | ||
KernelVersion: | ||
Contact: [email protected] | ||
Description: | ||
This bridge switch is used to disconnect it when there is a | ||
need to minimize the system current consumption. | ||
Reading gives the state of the bridge switch. | ||
Writing '1' enables the bridge switch. | ||
|
||
What: /sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration | ||
KernelVersion: | ||
Contact: [email protected] | ||
Description: | ||
Initiates the system calibration procedure. This is done on a | ||
single channel at a time. Write '1' to start the calibration. | ||
|
||
What: /sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration_mode_available | ||
KernelVersion: | ||
Contact: [email protected] | ||
Description: | ||
Reading returns a list with the possible calibration modes. | ||
There are two available options: | ||
"zero_scale" - calibrate to zero scale | ||
"full_scale" - calibrate to full scale | ||
|
||
What: /sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration_mode | ||
KernelVersion: | ||
Contact: [email protected] | ||
Description: | ||
Sets up the calibration mode used in the system calibration | ||
procedure. Reading returns the current calibration mode. | ||
Writing sets the system calibration mode. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
# SPDX-License-Identifier: GPL-2.0 | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/counter/ti-eqep.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Texas Instruments Enhanced Quadrature Encoder Pulse (eQEP) Module | ||
|
||
maintainers: | ||
- David Lechner <[email protected]> | ||
|
||
properties: | ||
compatible: | ||
const: ti,am3352-eqep | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
description: The eQEP event interrupt | ||
maxItems: 1 | ||
|
||
clocks: | ||
description: The clock that determines the SYSCLKOUT rate for the eQEP | ||
peripheral. | ||
maxItems: 1 | ||
|
||
clock-names: | ||
const: sysclkout | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- clocks | ||
- clock-names | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
eqep0: counter@180 { | ||
compatible = "ti,am3352-eqep"; | ||
reg = <0x180 0x80>; | ||
clocks = <&l4ls_gclk>; | ||
clock-names = "sysclkout"; | ||
interrupts = <79>; | ||
}; | ||
... |
104 changes: 104 additions & 0 deletions
104
Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
# SPDX-License-Identifier: GPL-2.0-only | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/iio/adc/adi,ad7292.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Analog Devices AD7292 10-Bit Monitor and Control System | ||
|
||
maintainers: | ||
- Marcelo Schmitt <[email protected]> | ||
|
||
description: | | ||
Analog Devices AD7292 10-Bit Monitor and Control System with ADC, DACs, | ||
Temperature Sensor, and GPIOs | ||
Specifications about the part can be found at: | ||
https://www.analog.com/media/en/technical-documentation/data-sheets/ad7292.pdf | ||
properties: | ||
compatible: | ||
enum: | ||
- adi,ad7292 | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
vref-supply: | ||
description: | | ||
The regulator supply for ADC and DAC reference voltage. | ||
spi-cpha: true | ||
|
||
'#address-cells': | ||
const: 1 | ||
|
||
'#size-cells': | ||
const: 0 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- spi-cpha | ||
|
||
patternProperties: | ||
"^channel@[0-7]$": | ||
type: object | ||
description: | | ||
Represents the external channels which are connected to the ADC. | ||
See Documentation/devicetree/bindings/iio/adc/adc.txt. | ||
properties: | ||
reg: | ||
description: | | ||
The channel number. It can have up to 8 channels numbered from 0 to 7. | ||
items: | ||
maximum: 7 | ||
|
||
diff-channels: | ||
description: see Documentation/devicetree/bindings/iio/adc/adc.txt | ||
maxItems: 1 | ||
|
||
required: | ||
- reg | ||
|
||
examples: | ||
- | | ||
spi { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
ad7292: adc@0 { | ||
compatible = "adi,ad7292"; | ||
reg = <0>; | ||
spi-max-frequency = <25000000>; | ||
vref-supply = <&adc_vref>; | ||
spi-cpha; | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
channel@0 { | ||
reg = <0>; | ||
diff-channels = <0 1>; | ||
}; | ||
channel@2 { | ||
reg = <2>; | ||
}; | ||
channel@3 { | ||
reg = <3>; | ||
}; | ||
channel@4 { | ||
reg = <4>; | ||
}; | ||
channel@5 { | ||
reg = <5>; | ||
}; | ||
channel@6 { | ||
reg = <6>; | ||
}; | ||
channel@7 { | ||
reg = <7>; | ||
}; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
71 changes: 71 additions & 0 deletions
71
Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause | ||
# Copyright 2019 Marcus Folkesson <[email protected]> | ||
%YAML 1.2 | ||
--- | ||
$id: "http://devicetree.org/schemas/bindings/iio/adc/microchip,mcp3911.yaml#" | ||
$schema: "http://devicetree.org/meta-schemas/core.yaml#" | ||
|
||
title: Microchip MCP3911 Dual channel analog front end (ADC) | ||
|
||
maintainers: | ||
- Marcus Folkesson <[email protected]> | ||
- Kent Gustavsson <[email protected]> | ||
|
||
description: | | ||
Bindings for the Microchip MCP3911 Dual channel ADC device. Datasheet can be | ||
found here: https://ww1.microchip.com/downloads/en/DeviceDoc/20002286C.pdf | ||
properties: | ||
compatible: | ||
enum: | ||
- microchip,mcp3911 | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
spi-max-frequency: | ||
maximum: 20000000 | ||
|
||
clocks: | ||
description: | | ||
Phandle and clock identifier for external sampling clock. | ||
If not specified, the internal crystal oscillator will be used. | ||
maxItems: 1 | ||
|
||
interrupts: | ||
description: IRQ line of the ADC | ||
maxItems: 1 | ||
|
||
microchip,device-addr: | ||
description: Device address when multiple MCP3911 chips are present on the same SPI bus. | ||
allOf: | ||
- $ref: /schemas/types.yaml#/definitions/uint32 | ||
- enum: [0, 1, 2, 3] | ||
- default: 0 | ||
|
||
vref-supply: | ||
description: | | ||
Phandle to the external reference voltage supply. | ||
If not specified, the internal voltage reference (1.2V) will be used. | ||
required: | ||
- compatible | ||
- reg | ||
|
||
examples: | ||
- | | ||
spi { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
adc@0 { | ||
compatible = "microchip,mcp3911"; | ||
reg = <0>; | ||
interrupt-parent = <&gpio5>; | ||
interrupts = <15 2>; | ||
spi-max-frequency = <20000000>; | ||
microchip,device-addr = <0>; | ||
vref-supply = <&vref_reg>; | ||
clocks = <&xtal>; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.