forked from analogdevicesinc/linux
-
Notifications
You must be signed in to change notification settings - Fork 3
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-3.13-rc1' of git://git.kernel.org/pub/scm/linux/ke…
…rnel/git/gregkh/staging Pull staging driver update from Greg KH: "Here's the big drivers/staging/ update for 3.13-rc1. Nothing major here, just a _ton_ of fixes and cleanups, mostly driven by the new round of OPW applicants, but also there are lots of other people doing staging tree cleanups these days in order to help get the drivers into mergable shape. We also merge, and then revert, the ktap code, as Ingo and the other perf/ftrace developers feel it should go into the "real" part of the kernel with only a bit more work, so no need to put it in staging for now. All of this has been in linux-next for a while with no reported issues" * tag 'staging-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1045 commits) staging: drm/imx: fix return value check in ipu_add_subdevice_pdata() Staging: zram: Fix access of NULL pointer Staging: zram: Fix variable dereferenced before check Staging: rtl8187se: space prohibited before semicolon in r8185b_init.c Staging: rtl8187se: fix space prohibited after that open parenthesis '(' in r8185b_init.c Staging: rtl8187se: fix braces {} are not necessary for single statement blocks in r8185b_init.c Staging: rtl8187se: fix trailing whitespace in r8185b_init.c Staging: rtl8187se: fix please, no space before tabs in r8185b_init.c drivers/staging/nvec/Kconfig: remove trailing whitespace Staging: dwc2: Fix variable dereferenced before check Staging: xgifb: fix braces {} are not necessary for any arm of this statement staging: rtl8192e: remove unneeded semicolons staging: rtl8192e: use true and false for bool variables staging: ft1000: return values corrected in scram_start_dwnld staging: ft1000: change values of status return variable in write_dpram32_and_check staging: bcm: Remove unnecessary pointer casting imx-drm: ipuv3-crtc: Invert IPU DI0 clock polarity staging: r8188eu: Fix sparse warnings in rtl_p2p.c staging: r8188eu: Fix sparse warnings in rtw_mlme_ext.c staging: r8188eu: Fix sparse warnings in rtl8188e.cmd.c ...
- Loading branch information
Showing
687 changed files
with
24,003 additions
and
22,397 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 |
---|---|---|
|
@@ -79,7 +79,7 @@ Description: | |
correspond to externally available input one of the named | ||
versions may be used. The number must always be specified and | ||
unique to allow association with event codes. Units after | ||
application of scale and offset are microvolts. | ||
application of scale and offset are millivolts. | ||
|
||
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY-voltageZ_raw | ||
KernelVersion: 2.6.35 | ||
|
@@ -90,7 +90,7 @@ Description: | |
physically equivalent inputs when non differential readings are | ||
separately available. In differential only parts, then all that | ||
is required is a consistent labeling. Units after application | ||
of scale and offset are microvolts. | ||
of scale and offset are millivolts. | ||
|
||
What: /sys/bus/iio/devices/iio:deviceX/in_capacitanceY_raw | ||
KernelVersion: 3.2 | ||
|
@@ -537,6 +537,62 @@ Description: | |
value is in raw device units or in processed units (as _raw | ||
and _input do on sysfs direct channel read attributes). | ||
|
||
What: /sys/.../events/in_accel_x_thresh_rising_hysteresis | ||
What: /sys/.../events/in_accel_x_thresh_falling_hysteresis | ||
What: /sys/.../events/in_accel_x_thresh_either_hysteresis | ||
What: /sys/.../events/in_accel_y_thresh_rising_hysteresis | ||
What: /sys/.../events/in_accel_y_thresh_falling_hysteresis | ||
What: /sys/.../events/in_accel_y_thresh_either_hysteresis | ||
What: /sys/.../events/in_accel_z_thresh_rising_hysteresis | ||
What: /sys/.../events/in_accel_z_thresh_falling_hysteresis | ||
What: /sys/.../events/in_accel_z_thresh_either_hysteresis | ||
What: /sys/.../events/in_anglvel_x_thresh_rising_hysteresis | ||
What: /sys/.../events/in_anglvel_x_thresh_falling_hysteresis | ||
What: /sys/.../events/in_anglvel_x_thresh_either_hysteresis | ||
What: /sys/.../events/in_anglvel_y_thresh_rising_hysteresis | ||
What: /sys/.../events/in_anglvel_y_thresh_falling_hysteresis | ||
What: /sys/.../events/in_anglvel_y_thresh_either_hysteresis | ||
What: /sys/.../events/in_anglvel_z_thresh_rising_hysteresis | ||
What: /sys/.../events/in_anglvel_z_thresh_falling_hysteresis | ||
What: /sys/.../events/in_anglvel_z_thresh_either_hysteresis | ||
What: /sys/.../events/in_magn_x_thresh_rising_hysteresis | ||
What: /sys/.../events/in_magn_x_thresh_falling_hysteresis | ||
What: /sys/.../events/in_magn_x_thresh_either_hysteresis | ||
What: /sys/.../events/in_magn_y_thresh_rising_hysteresis | ||
What: /sys/.../events/in_magn_y_thresh_falling_hysteresis | ||
What: /sys/.../events/in_magn_y_thresh_either_hysteresis | ||
What: /sys/.../events/in_magn_z_thresh_rising_hysteresis | ||
What: /sys/.../events/in_magn_z_thresh_falling_hysteresis | ||
What: /sys/.../events/in_magn_z_thresh_either_hysteresis | ||
What: /sys/.../events/in_voltageY_thresh_rising_hysteresis | ||
What: /sys/.../events/in_voltageY_thresh_falling_hysteresis | ||
What: /sys/.../events/in_voltageY_thresh_either_hysteresis | ||
What: /sys/.../events/in_tempY_thresh_rising_hysteresis | ||
What: /sys/.../events/in_tempY_thresh_falling_hysteresis | ||
What: /sys/.../events/in_tempY_thresh_either_hysteresis | ||
What: /sys/.../events/in_illuminance0_thresh_falling_hysteresis | ||
what: /sys/.../events/in_illuminance0_thresh_rising_hysteresis | ||
what: /sys/.../events/in_illuminance0_thresh_either_hysteresis | ||
what: /sys/.../events/in_proximity0_thresh_falling_hysteresis | ||
what: /sys/.../events/in_proximity0_thresh_rising_hysteresis | ||
what: /sys/.../events/in_proximity0_thresh_either_hysteresis | ||
KernelVersion: 3.13 | ||
Contact: [email protected] | ||
Description: | ||
Specifies the hysteresis of threshold that the device is comparing | ||
against for the events enabled by | ||
<type>Y[_name]_thresh[_(rising|falling)]_hysteresis. | ||
If separate attributes exist for the two directions, but | ||
direction is not specified for this attribute, then a single | ||
hysteresis value applies to both directions. | ||
For falling events the hysteresis is added to the _value attribute for | ||
this event to get the upper threshold for when the event goes back to | ||
normal, for rising events the hysteresis is subtracted from the _value | ||
attribute. E.g. if in_voltage0_raw_thresh_rising_value is set to 1200 | ||
and in_voltage0_raw_thresh_rising_hysteresis is set to 50. The event | ||
will get activated once in_voltage0_raw goes above 1200 and will become | ||
deactived again once the value falls below 1150. | ||
|
||
What: /sys/.../events/in_accel_x_raw_roc_rising_value | ||
What: /sys/.../events/in_accel_x_raw_roc_falling_value | ||
What: /sys/.../events/in_accel_y_raw_roc_rising_value | ||
|
@@ -811,3 +867,14 @@ Description: | |
Writing '1' stores the current device configuration into | ||
on-chip EEPROM. After power-up or chip reset the device will | ||
automatically load the saved configuration. | ||
|
||
What: /sys/.../iio:deviceX/in_intensity_red_integration_time | ||
What: /sys/.../iio:deviceX/in_intensity_green_integration_time | ||
What: /sys/.../iio:deviceX/in_intensity_blue_integration_time | ||
What: /sys/.../iio:deviceX/in_intensity_clear_integration_time | ||
What: /sys/.../iio:deviceX/in_illuminance_integration_time | ||
KernelVersion: 3.12 | ||
Contact: [email protected] | ||
Description: | ||
This attribute is used to get/set the integration time in | ||
seconds. |
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,26 @@ | ||
* Capella CM36651 I2C Proximity and Color Light sensor | ||
|
||
Required properties: | ||
- compatible: must be "capella,cm36651" | ||
- reg: the I2C address of the device | ||
- interrupts: interrupt-specifier for the sole interrupt | ||
generated by the device | ||
- vled-supply: regulator for the IR LED. IR_LED is a part | ||
of the cm36651 for proximity detection. | ||
As covered in ../../regulator/regulator.txt | ||
|
||
Example: | ||
|
||
i2c_cm36651: i2c-gpio { | ||
/* ... */ | ||
|
||
cm36651@18 { | ||
compatible = "capella,cm36651"; | ||
reg = <0x18>; | ||
interrupt-parent = <&gpx0>; | ||
interrupts = <2 0>; | ||
vled-supply = <&ps_als_reg>; | ||
}; | ||
|
||
/* ... */ | ||
}; |
21 changes: 21 additions & 0 deletions
21
Documentation/devicetree/bindings/iio/light/gp2ap020a00f.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 @@ | ||
* Sharp GP2AP020A00F I2C Proximity/ALS sensor | ||
|
||
The proximity detector sensor requires power supply | ||
for its built-in led. It is also defined by this binding. | ||
|
||
Required properties: | ||
|
||
- compatible : should be "sharp,gp2ap020a00f" | ||
- reg : the I2C slave address of the light sensor | ||
- interrupts : interrupt specifier for the sole interrupt generated | ||
by the device | ||
- vled-supply : VLED power supply, as covered in ../regulator/regulator.txt | ||
|
||
Example: | ||
|
||
gp2ap020a00f@39 { | ||
compatible = "sharp,gp2ap020a00f"; | ||
reg = <0x39>; | ||
interrupts = <2 0>; | ||
vled-supply = <...>; | ||
}; |
36 changes: 31 additions & 5 deletions
36
Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.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 |
---|---|---|
@@ -1,21 +1,47 @@ | ||
* Freescale i.MX28 LRADC device driver | ||
|
||
Required properties: | ||
- compatible: Should be "fsl,imx28-lradc" | ||
- compatible: Should be "fsl,imx23-lradc" for i.MX23 SoC and "fsl,imx28-lradc" | ||
for i.MX28 SoC | ||
- reg: Address and length of the register set for the device | ||
- interrupts: Should contain the LRADC interrupts | ||
|
||
Optional properties: | ||
- fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen | ||
to LRADC. Valid value is either 4 or 5. If this | ||
property is not present, then the touchscreen is | ||
disabled. | ||
disabled. 5 wires is valid for i.MX28 SoC only. | ||
- fsl,ave-ctrl: number of samples per direction to calculate an average value. | ||
Allowed value is 1 ... 31, default is 4 | ||
- fsl,ave-delay: delay between consecutive samples. Allowed value is | ||
1 ... 2047. It is used if 'fsl,ave-ctrl' > 1, counts at | ||
2 kHz and its default is 2 (= 1 ms) | ||
- fsl,settling: delay between plate switch to next sample. Allowed value is | ||
1 ... 2047. It counts at 2 kHz and its default is | ||
10 (= 5 ms) | ||
|
||
Examples: | ||
Example for i.MX23 SoC: | ||
|
||
lradc@80050000 { | ||
compatible = "fsl,imx23-lradc"; | ||
reg = <0x80050000 0x2000>; | ||
interrupts = <36 37 38 39 40 41 42 43 44>; | ||
status = "okay"; | ||
fsl,lradc-touchscreen-wires = <4>; | ||
fsl,ave-ctrl = <4>; | ||
fsl,ave-delay = <2>; | ||
fsl,settling = <10>; | ||
}; | ||
|
||
Example for i.MX28 SoC: | ||
|
||
lradc@80050000 { | ||
compatible = "fsl,imx28-lradc"; | ||
reg = <0x80050000 0x2000>; | ||
interrupts = <10 14 15 16 17 18 19 | ||
20 21 22 23 24 25>; | ||
interrupts = <10 14 15 16 17 18 19 20 21 22 23 24 25>; | ||
status = "okay"; | ||
fsl,lradc-touchscreen-wires = <5>; | ||
fsl,ave-ctrl = <4>; | ||
fsl,ave-delay = <2>; | ||
fsl,settling = <10>; | ||
}; |
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 |
---|---|---|
|
@@ -4240,7 +4240,7 @@ S: Maintained | |
F: drivers/media/rc/iguanair.c | ||
|
||
IIO SUBSYSTEM AND DRIVERS | ||
M: Jonathan Cameron <jic23@cam.ac.uk> | ||
M: Jonathan Cameron <jic23@kernel.org> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/iio/ | ||
|
@@ -4777,6 +4777,13 @@ S: Maintained | |
F: Documentation/hwmon/k8temp | ||
F: drivers/hwmon/k8temp.c | ||
|
||
KTAP | ||
M: Jovi Zhangwei <[email protected]> | ||
W: http://www.ktap.org | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/staging/ktap/ | ||
|
||
KCONFIG | ||
M: Michal Marek <[email protected]> | ||
L: [email protected] | ||
|
@@ -8009,7 +8016,7 @@ S: Maintained | |
F: drivers/staging/media/go7007/ | ||
|
||
STAGING - INDUSTRIAL IO | ||
M: Jonathan Cameron <jic23@cam.ac.uk> | ||
M: Jonathan Cameron <jic23@kernel.org> | ||
L: [email protected] | ||
S: Odd Fixes | ||
F: drivers/staging/iio/ | ||
|
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
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.