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.9-rc1' of git://git.kernel.org/pub/scm/linux/ker…
…nel/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 ...
- Loading branch information
Showing
829 changed files
with
12,193 additions
and
7,174 deletions.
There are no files selected for viewing
File renamed without changes.
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 |
---|---|---|
|
@@ -1569,7 +1569,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw | |
KernelVersion: 4.3 | ||
Contact: [email protected] | ||
Description: | ||
Raw (unscaled no offset etc.) percentage reading of a substance. | ||
Raw (unscaled no offset etc.) reading of a substance. Units | ||
after application of scale and offset are percents. | ||
|
||
What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw | ||
What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw | ||
|
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,20 @@ | ||
What: /sys/bus/iio/devices/iio:deviceX/in_accel_x_calibbias | ||
What: /sys/bus/iio/devices/iio:deviceX/in_accel_y_calibbias | ||
What: /sys/bus/iio/devices/iio:deviceX/in_accel_z_calibbias | ||
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_x_calibbias | ||
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_y_calibbias | ||
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibbias | ||
KernelVersion: 5.8 | ||
Contact: [email protected] | ||
Description: | ||
Hardware applied calibration offset (assumed to fix production | ||
inaccuracies). Values represent a real physical offset expressed | ||
in SI units (m/s^2 for accelerometer and rad/s for gyroscope). | ||
|
||
What: /sys/bus/iio/devices/iio:deviceX/in_accel_calibbias_available | ||
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_calibbias_available | ||
KernelVersion: 5.8 | ||
Contact: [email protected] | ||
Description: | ||
Range of available values for hardware offset. Values in SI | ||
units (m/s^2 for accelerometer and rad/s for gyroscope). |
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,34 @@ | ||
What: /sys/bus/iio/devices/iio:deviceX/calibration_auto_enable | ||
Date: June 2020 | ||
KernelVersion: 5.8 | ||
Contact: [email protected] | ||
Description: | ||
Contaminants build-up in the measurement chamber or optical | ||
elements deterioration leads to sensor drift. | ||
|
||
One can compensate for sensor drift by using automatic self | ||
calibration procedure (asc). | ||
|
||
Writing 1 or 0 to this attribute will respectively activate or | ||
deactivate asc. | ||
|
||
Upon reading current asc status is returned. | ||
|
||
What: /sys/bus/iio/devices/iio:deviceX/calibration_forced_value | ||
Date: June 2020 | ||
KernelVersion: 5.8 | ||
Contact: [email protected] | ||
Description: | ||
Contaminants build-up in the measurement chamber or optical | ||
elements deterioration leads to sensor drift. | ||
|
||
One can compensate for sensor drift by using forced | ||
recalibration (frc). This is useful in case there's known | ||
co2 reference available nearby the sensor. | ||
|
||
Picking value from the range [400 1 2000] and writing it to the | ||
sensor will set frc. | ||
|
||
Upon reading current frc value is returned. Note that after | ||
power cycling default value (i.e 400) is returned even though | ||
internally sensor had recalibrated itself. |
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 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
22 changes: 0 additions & 22 deletions
22
Documentation/devicetree/bindings/iio/accel/kionix,kxsd9.txt
This file was deleted.
Oops, something went wrong.
65 changes: 65 additions & 0 deletions
65
Documentation/devicetree/bindings/iio/accel/kionix,kxsd9.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,65 @@ | ||
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/iio/accel/kionix,kxsd9.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Kionix KXSD9 Accelerometer | ||
|
||
maintainers: | ||
- Jonathan Cameron <[email protected]> | ||
|
||
description: | | ||
3 axis 12 bit accelerometer with +-8G range on all axes. Also has a | ||
12 bit auxiliary ADC channel. Interface is either SPI or I2C. | ||
properties: | ||
compatible: | ||
const: kionix,kxsd9 | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
vdd-supply: true | ||
iovdd-supply: true | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
mount-matrix: | ||
description: an optional 3x3 mounting rotation matrix. | ||
|
||
required: | ||
- compatible | ||
- reg | ||
|
||
examples: | ||
- | | ||
# include <dt-bindings/interrupt-controller/irq.h> | ||
i2c { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
accel@18 { | ||
compatible = "kionix,kxsd9"; | ||
reg = <0x18>; | ||
iovdd-supply = <&iovdd>; | ||
vdd-supply = <&vdd>; | ||
interrupts = <57 IRQ_TYPE_EDGE_FALLING>; | ||
mount-matrix = "-0.984807753012208", "0", "-0.173648177666930", | ||
"0", "-1", "0", | ||
"-0.173648177666930", "0", "0.984807753012208"; | ||
}; | ||
}; | ||
- | | ||
# include <dt-bindings/interrupt-controller/irq.h> | ||
spi { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
accel@0 { | ||
compatible = "kionix,kxsd9"; | ||
reg = <0>; | ||
spi-max-frequency = <10000000>; | ||
}; | ||
}; | ||
... |
This file was deleted.
Oops, something went wrong.
71 changes: 71 additions & 0 deletions
71
Documentation/devicetree/bindings/iio/adc/ingenic,adc.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-2020 Artur Rojek | ||
%YAML 1.2 | ||
--- | ||
$id: "http://devicetree.org/schemas/iio/adc/ingenic,adc.yaml#" | ||
$schema: "http://devicetree.org/meta-schemas/core.yaml#" | ||
|
||
title: Ingenic JZ47xx ADC controller IIO bindings | ||
|
||
maintainers: | ||
- Artur Rojek <[email protected]> | ||
|
||
description: > | ||
Industrial I/O subsystem bindings for ADC controller found in | ||
Ingenic JZ47xx SoCs. | ||
ADC clients must use the format described in iio-bindings.txt, giving | ||
a phandle and IIO specifier pair ("io-channels") to the ADC controller. | ||
properties: | ||
compatible: | ||
enum: | ||
- ingenic,jz4725b-adc | ||
- ingenic,jz4740-adc | ||
- ingenic,jz4770-adc | ||
|
||
'#io-channel-cells': | ||
const: 1 | ||
description: | ||
Must be set to <1> to indicate channels are selected by index. | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
clocks: | ||
maxItems: 1 | ||
|
||
clock-names: | ||
items: | ||
- const: adc | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
required: | ||
- compatible | ||
- '#io-channel-cells' | ||
- reg | ||
- clocks | ||
- clock-names | ||
- interrupts | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/clock/jz4740-cgu.h> | ||
#include <dt-bindings/iio/adc/ingenic,adc.h> | ||
adc@10070000 { | ||
compatible = "ingenic,jz4740-adc"; | ||
#io-channel-cells = <1>; | ||
reg = <0x10070000 0x30>; | ||
clocks = <&cgu JZ4740_CLK_ADC>; | ||
clock-names = "adc"; | ||
interrupt-parent = <&intc>; | ||
interrupts = <18>; | ||
}; |
Oops, something went wrong.