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-3.17-rc1' of git://git.kernel.org/pub/scm/linux/ke…
…rnel/git/gregkh/staging Pull staging driver updates from Greg KH: "Here's the big pull request for the staging driver tree for 3.17-rc1. Lots of things in here, over 2000 patches, but the best part is this: 1480 files changed, 39070 insertions(+), 254659 deletions(-) Thanks to the great work of Kristina Martšenko, 14 different staging drivers have been removed from the tree as they were obsolete and no one was willing to work on cleaning them up. Other than the driver removals, loads of cleanups are in here (comedi, lustre, etc.) as well as the usual IIO driver updates and additions. All of this has been in the linux-next tree for a while" * tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (2199 commits) staging: comedi: addi_apci_1564: remove diagnostic interrupt support code staging: comedi: addi_apci_1564: add subdevice to check diagnostic status staging: wlan-ng: coding style problem fix staging: wlan-ng: fixing coding style problems staging: comedi: ii_pci20kc: request and ioremap memory staging: lustre: bitwise vs logical typo staging: dgnc: Remove unneeded dgnc_trace.c and dgnc_trace.h staging: dgnc: rephrase comment staging: comedi: ni_tio: remove some dead code staging: rtl8723au: Fix static symbol sparse warning staging: rtl8723au: usb_dvobj_init(): Remove unused variable 'pdev_desc' staging: rtl8723au: Do not duplicate kernel provided USB macros staging: rtl8723au: Remove never set struct pwrctrl_priv.bHWPowerdown staging: rtl8723au: Remove two never set variables staging: rtl8723au: RSSI_test is never set staging:r8190: coding style: Fixed checkpatch reported Error staging:r8180: coding style: Fixed too long lines staging:r8180: coding style: Fixed commenting style staging: lustre: ptlrpc: lproc_ptlrpc.c - fix dereferenceing user space buffer staging: lustre: ldlm: ldlm_resource.c - fix dereferenceing user space buffer ...
- Loading branch information
Showing
1,478 changed files
with
38,903 additions
and
254,623 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 |
|---|---|---|
|
|
@@ -260,6 +260,10 @@ What: /sys/bus/iio/devices/iio:deviceX/in_magn_scale | |
| What: /sys/bus/iio/devices/iio:deviceX/in_magn_x_scale | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_magn_y_scale | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_magn_z_scale | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_magnetic_scale | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_true_scale | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_magnetic_tilt_comp_scale | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_true_tilt_comp_scale | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_pressureY_scale | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_pressure_scale | ||
| KernelVersion: 2.6.35 | ||
|
|
@@ -447,6 +451,14 @@ What: /sys/.../iio:deviceX/events/in_magn_y_thresh_rising_en | |
| What: /sys/.../iio:deviceX/events/in_magn_y_thresh_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_magn_z_thresh_rising_en | ||
| What: /sys/.../iio:deviceX/events/in_magn_z_thresh_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_thresh_rising_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_thresh_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_true_thresh_rising_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_true_thresh_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_tilt_comp_thresh_rising_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_tilt_comp_thresh_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_true_tilt_comp_thresh_rising_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_true_tilt_comp_thresh_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_voltageY_supply_thresh_rising_en | ||
| What: /sys/.../iio:deviceX/events/in_voltageY_supply_thresh_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_voltageY_thresh_rising_en | ||
|
|
@@ -492,6 +504,14 @@ What: /sys/.../iio:deviceX/events/in_magn_y_roc_rising_en | |
| What: /sys/.../iio:deviceX/events/in_magn_y_roc_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_magn_z_roc_rising_en | ||
| What: /sys/.../iio:deviceX/events/in_magn_z_roc_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_roc_rising_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_roc_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_true_roc_rising_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_true_roc_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_tilt_comp_roc_rising_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_tilt_comp_roc_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_true_tilt_comp_roc_rising_en | ||
| What: /sys/.../iio:deviceX/events/in_rot_from_north_true_tilt_comp_roc_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_voltageY_supply_roc_rising_en | ||
| What: /sys/.../iio:deviceX/events/in_voltageY_supply_roc_falling_en | ||
| What: /sys/.../iio:deviceX/events/in_voltageY_roc_rising_en | ||
|
|
@@ -538,6 +558,14 @@ What: /sys/.../events/in_magn_y_raw_thresh_rising_value | |
| What: /sys/.../events/in_magn_y_raw_thresh_falling_value | ||
| What: /sys/.../events/in_magn_z_raw_thresh_rising_value | ||
| What: /sys/.../events/in_magn_z_raw_thresh_falling_value | ||
| What: /sys/.../events/in_rot_from_north_magnetic_raw_thresh_rising_value | ||
| What: /sys/.../events/in_rot_from_north_magnetic_raw_thresh_falling_value | ||
| What: /sys/.../events/in_rot_from_north_true_raw_thresh_rising_value | ||
| What: /sys/.../events/in_rot_from_north_true_raw_thresh_falling_value | ||
| What: /sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_thresh_rising_value | ||
| What: /sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_thresh_falling_value | ||
| What: /sys/.../events/in_rot_from_north_true_tilt_comp_raw_thresh_rising_value | ||
| What: /sys/.../events/in_rot_from_north_true_tilt_comp_raw_thresh_falling_value | ||
| What: /sys/.../events/in_voltageY_supply_raw_thresh_rising_value | ||
| What: /sys/.../events/in_voltageY_supply_raw_thresh_falling_value | ||
| What: /sys/.../events/in_voltageY_raw_thresh_rising_value | ||
|
|
@@ -588,6 +616,18 @@ 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_rot_from_north_magnetic_thresh_rising_hysteresis | ||
| What: /sys/.../events/in_rot_from_north_magnetic_thresh_falling_hysteresis | ||
| What: /sys/.../events/in_rot_from_north_magnetic_thresh_either_hysteresis | ||
| What: /sys/.../events/in_rot_from_north_true_thresh_rising_hysteresis | ||
| What: /sys/.../events/in_rot_from_north_true_thresh_falling_hysteresis | ||
| What: /sys/.../events/in_rot_from_north_true_thresh_either_hysteresis | ||
| What: /sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_rising_hysteresis | ||
| What: /sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_falling_hysteresis | ||
| What: /sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_either_hysteresis | ||
| What: /sys/.../events/in_rot_from_north_true_tilt_comp_thresh_rising_hysteresis | ||
| What: /sys/.../events/in_rot_from_north_true_tilt_comp_thresh_falling_hysteresis | ||
| What: /sys/.../events/in_rot_from_north_true_tilt_comp_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 | ||
|
|
@@ -635,6 +675,14 @@ What: /sys/.../events/in_magn_y_raw_roc_rising_value | |
| What: /sys/.../events/in_magn_y_raw_roc_falling_value | ||
| What: /sys/.../events/in_magn_z_raw_roc_rising_value | ||
| What: /sys/.../events/in_magn_z_raw_roc_falling_value | ||
| What: /sys/.../events/in_rot_from_north_magnetic_raw_roc_rising_value | ||
| What: /sys/.../events/in_rot_from_north_magnetic_raw_roc_falling_value | ||
| What: /sys/.../events/in_rot_from_north_true_raw_roc_rising_value | ||
| What: /sys/.../events/in_rot_from_north_true_raw_roc_falling_value | ||
| What: /sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_roc_rising_value | ||
| What: /sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_roc_falling_value | ||
| What: /sys/.../events/in_rot_from_north_true_tilt_comp_raw_roc_rising_value | ||
| What: /sys/.../events/in_rot_from_north_true_tilt_comp_raw_roc_falling_value | ||
| What: /sys/.../events/in_voltageY_supply_raw_roc_rising_value | ||
| What: /sys/.../events/in_voltageY_supply_raw_roc_falling_value | ||
| What: /sys/.../events/in_voltageY_raw_roc_rising_value | ||
|
|
@@ -690,6 +738,22 @@ What: /sys/.../events/in_magn_z_thresh_rising_period | |
| What: /sys/.../events/in_magn_z_thresh_falling_period | ||
| What: /sys/.../events/in_magn_z_roc_rising_period | ||
| What: /sys/.../events/in_magn_z_roc_falling_period | ||
| What: /sys/.../events/in_rot_from_north_magnetic_thresh_rising_period | ||
| What: /sys/.../events/in_rot_from_north_magnetic_thresh_falling_period | ||
| What: /sys/.../events/in_rot_from_north_magnetic_roc_rising_period | ||
| What: /sys/.../events/in_rot_from_north_magnetic_roc_falling_period | ||
| What: /sys/.../events/in_rot_from_north_true_thresh_rising_period | ||
| What: /sys/.../events/in_rot_from_north_true_thresh_falling_period | ||
| What: /sys/.../events/in_rot_from_north_true_roc_rising_period | ||
| What: /sys/.../events/in_rot_from_north_true_roc_falling_period | ||
| What: /sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_rising_period | ||
| What: /sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_falling_period | ||
| What: /sys/.../events/in_rot_from_north_magnetic_tilt_comp_roc_rising_period | ||
| What: /sys/.../events/in_rot_from_north_magnetic_tilt_comp_roc_falling_period | ||
| What: /sys/.../events/in_rot_from_north_true_tilt_comp_thresh_rising_period | ||
| What: /sys/.../events/in_rot_from_north_true_tilt_comp_thresh_falling_period | ||
| What: /sys/.../events/in_rot_from_north_true_tilt_comp_roc_rising_period | ||
| What: /sys/.../events/in_rot_from_north_true_tilt_comp_roc_falling_period | ||
| What: /sys/.../events/in_voltageY_supply_thresh_rising_period | ||
| What: /sys/.../events/in_voltageY_supply_thresh_falling_period | ||
| What: /sys/.../events/in_voltageY_supply_roc_rising_period | ||
|
|
@@ -787,6 +851,10 @@ What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_en | |
| What: /sys/.../iio:deviceX/scan_elements/in_magn_x_en | ||
| What: /sys/.../iio:deviceX/scan_elements/in_magn_y_en | ||
| What: /sys/.../iio:deviceX/scan_elements/in_magn_z_en | ||
| What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_en | ||
| What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_en | ||
| What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_en | ||
| What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_en | ||
| What: /sys/.../iio:deviceX/scan_elements/in_timestamp_en | ||
| What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en | ||
| What: /sys/.../iio:deviceX/scan_elements/in_voltageY_en | ||
|
|
@@ -853,6 +921,10 @@ What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_index | |
| What: /sys/.../iio:deviceX/scan_elements/in_magn_x_index | ||
| What: /sys/.../iio:deviceX/scan_elements/in_magn_y_index | ||
| What: /sys/.../iio:deviceX/scan_elements/in_magn_z_index | ||
| What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_index | ||
| What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_index | ||
| What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_index | ||
| What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_index | ||
| What: /sys/.../iio:deviceX/scan_elements/in_incli_x_index | ||
| What: /sys/.../iio:deviceX/scan_elements/in_incli_y_index | ||
| What: /sys/.../iio:deviceX/scan_elements/in_timestamp_index | ||
|
|
@@ -895,6 +967,19 @@ Description: | |
| on-chip EEPROM. After power-up or chip reset the device will | ||
| automatically load the saved configuration. | ||
|
|
||
| What: /sys/.../iio:deviceX/in_proximity_raw | ||
| What: /sys/.../iio:deviceX/in_proximity_input | ||
| What: /sys/.../iio:deviceX/in_proximityY_raw | ||
| KernelVersion: 3.4 | ||
| Contact: [email protected] | ||
| Description: | ||
| Proximity measurement indicating that some | ||
| object is near the sensor, usually be observing | ||
| reflectivity of infrared or ultrasound emitted. | ||
| Often these sensors are unit less and as such conversion | ||
| to SI units is not possible. Where it is, the units should | ||
| be meters. | ||
|
|
||
| What: /sys/.../iio:deviceX/in_illuminanceY_input | ||
| What: /sys/.../iio:deviceX/in_illuminanceY_raw | ||
| What: /sys/.../iio:deviceX/in_illuminanceY_mean_raw | ||
|
|
@@ -933,3 +1018,13 @@ Description: | |
| x y z w. Here x, y, and z component represents the axis about | ||
| which a rotation will occur and w component represents the | ||
| amount of rotation. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_magnetic_tilt_comp_raw | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_true_tilt_comp_raw | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_magnetic_raw | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_true_raw | ||
| KernelVersion: 3.15 | ||
| Contact: [email protected] | ||
| Description: | ||
| Raw value of rotation from true/magnetic north measured with | ||
| or without compensation from tilt sensors. | ||
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
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,22 @@ | ||
| * Maxim 1027/1029/1031 Analog to Digital Converter (ADC) | ||
|
|
||
| Required properties: | ||
| - compatible: Should be "maxim,max1027" or "maxim,max1029" or "maxim,max1031" | ||
| - reg: SPI chip select number for the device | ||
| - interrupt-parent: phandle to the parent interrupt controller | ||
| see: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt | ||
| - interrupts: IRQ line for the ADC | ||
| see: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt | ||
|
|
||
| Recommended properties: | ||
| - spi-max-frequency: Definition as per | ||
| Documentation/devicetree/bindings/spi/spi-bus.txt | ||
|
|
||
| Example: | ||
| adc@0 { | ||
| compatible = "maxim,max1027"; | ||
| reg = <0>; | ||
| interrupt-parent = <&gpio5>; | ||
| interrupts = <15 IRQ_TYPE_EDGE_RISING>; | ||
| spi-max-frequency = <1000000>; | ||
| }; |
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,54 @@ | ||
| STMicroelectronics MEMS sensors | ||
|
|
||
| The STMicroelectronics sensor devices are pretty straight-forward I2C or | ||
| SPI devices, all sharing the same device tree descriptions no matter what | ||
| type of sensor it is. | ||
|
|
||
| Required properties: | ||
| - compatible: see the list of valid compatible strings below | ||
| - reg: the I2C or SPI address the device will respond to | ||
|
|
||
| Optional properties: | ||
| - vdd-supply: an optional regulator that needs to be on to provide VDD | ||
| power to the sensor. | ||
| - vddio-supply: an optional regulator that needs to be on to provide the | ||
| VDD IO power to the sensor. | ||
| - st,drdy-int-pin: the pin on the package that will be used to signal | ||
| "data ready" (valid values: 1 or 2). This property is not configurable | ||
| on all sensors. | ||
|
|
||
| Sensors may also have applicable pin control settings, those use the | ||
| standard bindings from pinctrl/pinctrl-bindings.txt. | ||
|
|
||
| Valid compatible strings: | ||
|
|
||
| Accelerometers: | ||
| - st,lsm303dlh-accel | ||
| - st,lsm303dlhc-accel | ||
| - st,lis3dh-accel | ||
| - st,lsm330d-accel | ||
| - st,lsm330dl-accel | ||
| - st,lsm330dlc-accel | ||
| - st,lis331dlh-accel | ||
| - st,lsm303dl-accel | ||
| - st,lsm303dlm-accel | ||
| - st,lsm330-accel | ||
|
|
||
| Gyroscopes: | ||
| - st,l3g4200d-gyro | ||
| - st,lsm330d-gyro | ||
| - st,lsm330dl-gyro | ||
| - st,lsm330dlc-gyro | ||
| - st,l3gd20-gyro | ||
| - st,l3g4is-gyro | ||
| - st,lsm330-gyro | ||
|
|
||
| Magnetometers: | ||
| - st,lsm303dlhc-magn | ||
| - st,lsm303dlm-magn | ||
| - st,lis3mdl-magn | ||
|
|
||
| Pressure sensors: | ||
| - st,lps001wp-press | ||
| - st,lps25h-press | ||
| - st,lps331ap-press |
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.