forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 4
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-4.7-rc1' of git://git.kernel.org/pub/scm/linux/ker…
…nel/git/gregkh/staging Pull staging and IIO driver updates from Greg KH: "Here's the big staging and iio driver update for 4.7-rc1. I think we almost broke even with this release, only adding a few more lines than we removed, which isn't bad overall given that there's a bunch of new iio drivers added. The Lustre developers seem to have woken up from their sleep and have been doing a great job in cleaning up the code and pruning unused or old cruft, the filesystem is almost readable :) Other than that, just a lot of basic coding style cleanups in the churn. All have been in linux-next for a while with no reported issues" * tag 'staging-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (938 commits) Staging: emxx_udc: emxx_udc: fixed coding style issue staging/gdm724x: fix "alignment should match open parenthesis" issues staging/gdm724x: Fix avoid CamelCase staging: unisys: rename misleading var ii with frag staging: unisys: visorhba: switch success handling to error handling staging: unisys: visorhba: main path needs to flow down the left margin staging: unisys: visorinput: handle_locking_key() simplifications staging: unisys: visorhba: fail gracefully for thread creation failures staging: unisys: visornic: comment restructuring and removing bad diction staging: unisys: fix format string %Lx to %llx for u64 staging: unisys: remove unused struct members staging: unisys: visorchannel: correct variable misspelling staging: unisys: visorhba: replace functionlike macro with function staging: dgnc: Need to check for NULL of ch staging: dgnc: remove redundant condition check staging: dgnc: fix 'line over 80 characters' staging: dgnc: clean up the dgnc_get_modem_info() staging: lustre: lnet: enable configuration per NI interface staging: lustre: o2iblnd: properly set ibr_why staging: lustre: o2iblnd: remove last of kiblnd_tunables_fini ...
- Loading branch information
Showing
668 changed files
with
25,475 additions
and
25,049 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 |
---|---|---|
|
@@ -1233,7 +1233,7 @@ KernelVersion: 3.4 | |
Contact: [email protected] | ||
Description: | ||
Proximity measurement indicating that some | ||
object is near the sensor, usually be observing | ||
object is near the sensor, usually by observing | ||
reflectivity of infrared or ultrasound emitted. | ||
Often these sensors are unit less and as such conversion | ||
to SI units is not possible. Higher proximity measurements | ||
|
@@ -1255,12 +1255,23 @@ Description: | |
What: /sys/.../iio:deviceX/in_intensityY_raw | ||
What: /sys/.../iio:deviceX/in_intensityY_ir_raw | ||
What: /sys/.../iio:deviceX/in_intensityY_both_raw | ||
What: /sys/.../iio:deviceX/in_intensityY_uv_raw | ||
KernelVersion: 3.4 | ||
Contact: [email protected] | ||
Description: | ||
Unit-less light intensity. Modifiers both and ir indicate | ||
that measurements contains visible and infrared light | ||
components or just infrared light, respectively. | ||
components or just infrared light, respectively. Modifier uv indicates | ||
that measurements contain ultraviolet light components. | ||
|
||
What: /sys/.../iio:deviceX/in_uvindex_input | ||
KernelVersion: 4.6 | ||
Contact: [email protected] | ||
Description: | ||
UV light intensity index measuring the human skin's response to | ||
different wavelength of sunlight weighted according to the | ||
standardised CIE Erythemal Action Spectrum. UV index values range | ||
from 0 (low) to >=11 (extreme). | ||
|
||
What: /sys/.../iio:deviceX/in_intensity_red_integration_time | ||
What: /sys/.../iio:deviceX/in_intensity_green_integration_time | ||
|
@@ -1501,3 +1512,56 @@ Contact: [email protected] | |
Description: | ||
Raw (unscaled no offset etc.) pH reading of a substance as a negative | ||
base-10 logarithm of hydrodium ions in a litre of water. | ||
|
||
What: /sys/bus/iio/devices/iio:deviceX/mount_matrix | ||
What: /sys/bus/iio/devices/iio:deviceX/in_mount_matrix | ||
What: /sys/bus/iio/devices/iio:deviceX/out_mount_matrix | ||
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_mount_matrix | ||
What: /sys/bus/iio/devices/iio:deviceX/in_accel_mount_matrix | ||
KernelVersion: 4.6 | ||
Contact: [email protected] | ||
Description: | ||
Mounting matrix for IIO sensors. This is a rotation matrix which | ||
informs userspace about sensor chip's placement relative to the | ||
main hardware it is mounted on. | ||
Main hardware placement is defined according to the local | ||
reference frame related to the physical quantity the sensor | ||
measures. | ||
Given that the rotation matrix is defined in a board specific | ||
way (platform data and / or device-tree), the main hardware | ||
reference frame definition is left to the implementor's choice | ||
(see below for a magnetometer example). | ||
Applications should apply this rotation matrix to samples so | ||
that when main hardware reference frame is aligned onto local | ||
reference frame, then sensor chip reference frame is also | ||
perfectly aligned with it. | ||
Matrix is a 3x3 unitary matrix and typically looks like | ||
[0, 1, 0; 1, 0, 0; 0, 0, -1]. Identity matrix | ||
[1, 0, 0; 0, 1, 0; 0, 0, 1] means sensor chip and main hardware | ||
are perfectly aligned with each other. | ||
|
||
For example, a mounting matrix for a magnetometer sensor informs | ||
userspace about sensor chip's ORIENTATION relative to the main | ||
hardware. | ||
More specifically, main hardware orientation is defined with | ||
respect to the LOCAL EARTH GEOMAGNETIC REFERENCE FRAME where : | ||
* Y is in the ground plane and positive towards magnetic North ; | ||
* X is in the ground plane, perpendicular to the North axis and | ||
positive towards the East ; | ||
* Z is perpendicular to the ground plane and positive upwards. | ||
|
||
An implementor might consider that for a hand-held device, a | ||
'natural' orientation would be 'front facing camera at the top'. | ||
The main hardware reference frame could then be described as : | ||
* Y is in the plane of the screen and is positive towards the | ||
top of the screen ; | ||
* X is in the plane of the screen, perpendicular to Y axis, and | ||
positive towards the right hand side of the screen ; | ||
* Z is perpendicular to the screen plane and positive out of the | ||
screen. | ||
Another example for a quadrotor UAV might be : | ||
* Y is in the plane of the propellers and positive towards the | ||
front-view camera; | ||
* X is in the plane of the propellers, perpendicular to Y axis, | ||
and positive towards the starboard side of the UAV ; | ||
* Z is perpendicular to propellers plane and positive upwards. |
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
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,21 @@ | ||
NXP LPC1850 ADC bindings | ||
|
||
Required properties: | ||
- compatible: Should be "nxp,lpc1850-adc" | ||
- reg: Offset and length of the register set for the ADC device | ||
- interrupts: The interrupt number for the ADC device | ||
- clocks: The root clock of the ADC controller | ||
- vref-supply: The regulator supply ADC reference voltage | ||
- resets: phandle to reset controller and line specifier | ||
|
||
Example: | ||
|
||
adc0: adc@400e3000 { | ||
compatible = "nxp,lpc1850-adc"; | ||
reg = <0x400e3000 0x1000>; | ||
interrupts = <17>; | ||
clocks = <&ccu1 CLK_APB3_ADC0>; | ||
vref-supply = <®_vdda>; | ||
resets = <&rgu 40>; | ||
status = "disabled"; | ||
}; |
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
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,155 @@ | ||
Analog Devices AD5592R/AD5593R DAC/ADC device driver | ||
|
||
Required properties for the AD5592R: | ||
- compatible: Must be "adi,ad5592r" | ||
- reg: SPI chip select number for the device | ||
- spi-max-frequency: Max SPI frequency to use (< 30000000) | ||
- spi-cpol: The AD5592R requires inverse clock polarity (CPOL) mode | ||
|
||
Required properties for the AD5593R: | ||
- compatible: Must be "adi,ad5593r" | ||
- reg: I2C address of the device | ||
|
||
Required properties for all supported chips: | ||
- #address-cells: Should be 1. | ||
- #size-cells: Should be 0. | ||
- channel nodes: | ||
Each child node represents one channel and has the following | ||
Required properties: | ||
* reg: Pin on which this channel is connected to. | ||
* adi,mode: Mode or function of this channel. | ||
Macros specifying the valid values | ||
can be found in <dt-bindings/iio/adi,ad5592r.h>. | ||
|
||
The following values are currently supported: | ||
* CH_MODE_UNUSED (the pin is unused) | ||
* CH_MODE_ADC (the pin is ADC input) | ||
* CH_MODE_DAC (the pin is DAC output) | ||
* CH_MODE_DAC_AND_ADC (the pin is DAC output | ||
but can be monitored by an ADC, since | ||
there is no disadvantage this | ||
this should be considered as the | ||
preferred DAC mode) | ||
* CH_MODE_GPIO (the pin is registered | ||
with GPIOLIB) | ||
Optional properties: | ||
* adi,off-state: State of this channel when unused or the | ||
device gets removed. Macros specifying the | ||
valid values can be found in | ||
<dt-bindings/iio/adi,ad5592r.h>. | ||
|
||
* CH_OFFSTATE_PULLDOWN (the pin is pulled down) | ||
* CH_OFFSTATE_OUT_LOW (the pin is output low) | ||
* CH_OFFSTATE_OUT_HIGH (the pin is output high) | ||
* CH_OFFSTATE_OUT_TRISTATE (the pin is | ||
tristated output) | ||
|
||
|
||
Optional properties: | ||
- vref-supply: Phandle to the external reference voltage supply. This should | ||
only be set if there is an external reference voltage connected to the VREF | ||
pin. If the property is not set the internal 2.5V reference is used. | ||
- reset-gpios : GPIO spec for the RESET pin. If specified, it will be | ||
asserted during driver probe. | ||
- gpio-controller: Marks the device node as a GPIO controller. | ||
- #gpio-cells: Should be 2. The first cell is the GPIO number and the second | ||
cell specifies GPIO flags, as defined in <dt-bindings/gpio/gpio.h>. | ||
|
||
AD5592R Example: | ||
|
||
#include <dt-bindings/iio/adi,ad5592r.h> | ||
|
||
vref: regulator-vref { | ||
compatible = "regulator-fixed"; | ||
regulator-name = "vref-ad559x"; | ||
regulator-min-microvolt = <3300000>; | ||
regulator-max-microvolt = <3300000>; | ||
regulator-always-on; | ||
}; | ||
|
||
ad5592r@0 { | ||
#size-cells = <0>; | ||
#address-cells = <1>; | ||
#gpio-cells = <2>; | ||
compatible = "adi,ad5592r"; | ||
reg = <0>; | ||
|
||
spi-max-frequency = <1000000>; | ||
spi-cpol; | ||
|
||
vref-supply = <&vref>; /* optional */ | ||
reset-gpios = <&gpio0 86 0>; /* optional */ | ||
gpio-controller; | ||
|
||
channel@0 { | ||
reg = <0>; | ||
adi,mode = <CH_MODE_DAC>; | ||
}; | ||
channel@1 { | ||
reg = <1>; | ||
adi,mode = <CH_MODE_ADC>; | ||
}; | ||
channel@2 { | ||
reg = <2>; | ||
adi,mode = <CH_MODE_DAC_AND_ADC>; | ||
}; | ||
channel@3 { | ||
reg = <3>; | ||
adi,mode = <CH_MODE_DAC_AND_ADC>; | ||
adi,off-state = <CH_OFFSTATE_PULLDOWN>; | ||
}; | ||
channel@4 { | ||
reg = <4>; | ||
adi,mode = <CH_MODE_UNUSED>; | ||
adi,off-state = <CH_OFFSTATE_PULLDOWN>; | ||
}; | ||
channel@5 { | ||
reg = <5>; | ||
adi,mode = <CH_MODE_GPIO>; | ||
adi,off-state = <CH_OFFSTATE_PULLDOWN>; | ||
}; | ||
channel@6 { | ||
reg = <6>; | ||
adi,mode = <CH_MODE_GPIO>; | ||
adi,off-state = <CH_OFFSTATE_PULLDOWN>; | ||
}; | ||
channel@7 { | ||
reg = <7>; | ||
adi,mode = <CH_MODE_GPIO>; | ||
adi,off-state = <CH_OFFSTATE_PULLDOWN>; | ||
}; | ||
}; | ||
|
||
AD5593R Example: | ||
|
||
#include <dt-bindings/iio/adi,ad5592r.h> | ||
|
||
ad5593r@10 { | ||
#size-cells = <0>; | ||
#address-cells = <1>; | ||
#gpio-cells = <2>; | ||
compatible = "adi,ad5593r"; | ||
reg = <0x10>; | ||
gpio-controller; | ||
|
||
channel@0 { | ||
reg = <0>; | ||
adi,mode = <CH_MODE_DAC>; | ||
adi,off-state = <CH_OFFSTATE_PULLDOWN>; | ||
}; | ||
channel@1 { | ||
reg = <1>; | ||
adi,mode = <CH_MODE_ADC>; | ||
adi,off-state = <CH_OFFSTATE_PULLDOWN>; | ||
}; | ||
channel@2 { | ||
reg = <2>; | ||
adi,mode = <CH_MODE_DAC_AND_ADC>; | ||
adi,off-state = <CH_OFFSTATE_PULLDOWN>; | ||
}; | ||
channel@6 { | ||
reg = <6>; | ||
adi,mode = <CH_MODE_GPIO>; | ||
adi,off-state = <CH_OFFSTATE_PULLDOWN>; | ||
}; | ||
}; |
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 @@ | ||
NXP LPC1850 DAC bindings | ||
|
||
Required properties: | ||
- compatible: Should be "nxp,lpc1850-dac" | ||
- reg: Offset and length of the register set for the ADC device | ||
- interrupts: The interrupt number for the ADC device | ||
- clocks: The root clock of the ADC controller | ||
- vref-supply: The regulator supply ADC reference voltage | ||
- resets: phandle to reset controller and line specifier | ||
|
||
Example: | ||
dac: dac@400e1000 { | ||
compatible = "nxp,lpc1850-dac"; | ||
reg = <0x400e1000 0x1000>; | ||
interrupts = <0>; | ||
clocks = <&ccu1 CLK_APB3_DAC>; | ||
vref-supply = <®_vdda>; | ||
resets = <&rgu 42>; | ||
status = "disabled"; | ||
}; |
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
21 changes: 21 additions & 0 deletions
21
Documentation/devicetree/bindings/iio/potentiometer/ds1803.txt
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,21 @@ | ||
* Maxim Integrated DS1803 digital potentiometer driver | ||
|
||
The node for this driver must be a child node of a I2C controller, hence | ||
all mandatory properties for your controller must be specified. See directory: | ||
|
||
Documentation/devicetree/bindings/i2c | ||
|
||
for more details. | ||
|
||
Required properties: | ||
- compatible: Must be one of the following, depending on the | ||
model: | ||
"maxim,ds1803-010", | ||
"maxim,ds1803-050", | ||
"maxim,ds1803-100" | ||
|
||
Example: | ||
ds1803: ds1803@1 { | ||
reg = <0x28>; | ||
compatible = "maxim,ds1803-010"; | ||
}; |
Oops, something went wrong.