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-4.8-rc1' of git://git.kernel.org/pub/scm/linux/ker…
…nel/git/gregkh/staging Pull staging and IIO driver updates from Greg KH: "Here is the big Staging and IIO driver update for 4.8-rc1. We ended up adding more code than removing, again, but it's not all that bad. Lots of cleanups all over the staging tree, and new IIO drivers, full details in the shortlog. All of these have been in linux-next for a while with no reported issues" * tag 'staging-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (417 commits) drivers:iio:accel:mma8452: removed unwanted return statements drivers:iio:accel:mma8452: added cleanup provision in case of failure. iio: Add iio.git tree to MAINTAINERS iio:st_pressure: clean useless static channel initializers iio:st_pressure:lps22hb: temperature support iio:st_pressure:lps22hb: open drain support iio:st_pressure: temperature triggered buffering iio:st_pressure: document sampling gains iio:st_pressure: align storagebits on power of 2 iio:st_sensors: align on storagebits boundaries staging:iio:lis3l02dq drop separate driver iio: accel: st_accel: Add lis3l02dq support iio: adc: add missing of_node references to iio_dev iio: adc: ti-ads1015: add indio_dev->dev.of_node reference iio: potentiometer: Fix typo in Kconfig iio: potentiometer: mcp4531: Add device tree binding iio: potentiometer: mcp4531: Add device tree binding documentation iio: potentiometer: mcp4531: Add support for MCP454x, MCP456x, MCP464x and MCP466x iio:imu:mpu6050: icm20608 initial support iio: adc: max1363: Add device tree binding ...
- Loading branch information
Showing
529 changed files
with
22,391 additions
and
12,655 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 |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ Aaron Durbin <[email protected]> | |
| Adam Oldham <[email protected]> | ||
| Adam Radford <[email protected]> | ||
| Adrian Bunk <[email protected]> | ||
| Adriana Reus <[email protected]> <[email protected]> | ||
| Alan Cox <[email protected]> | ||
| Alan Cox <[email protected]> | ||
| Aleksey Gorelov <[email protected]> | ||
|
|
@@ -94,6 +95,8 @@ Linas Vepstas <[email protected]> | |
| Mark Brown <[email protected]> | ||
| Matthieu CASTET <[email protected]> | ||
| Mauro Carvalho Chehab <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]> | ||
| Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]> | ||
| Matt Ranostay <[email protected]> <[email protected]> | ||
| Mayuresh Janorkar <[email protected]> | ||
| Michael Buesch <[email protected]> | ||
| Michel Dänzer <[email protected]> | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -32,6 +32,13 @@ Description: | |
| Description of the physical chip / device for device X. | ||
| Typically a part number. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/timestamp_clock | ||
| KernelVersion: 4.5 | ||
| Contact: [email protected] | ||
| Description: | ||
| String identifying current posix clock used to timestamp | ||
| buffered samples and events for device X. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/sampling_frequency | ||
| What: /sys/bus/iio/devices/iio:deviceX/buffer/sampling_frequency | ||
| What: /sys/bus/iio/devices/triggerX/sampling_frequency | ||
|
|
@@ -1565,3 +1572,10 @@ Description: | |
| * 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. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_electricalconductivity_raw | ||
| KernelVersion: 4.8 | ||
| Contact: [email protected] | ||
| Description: | ||
| Raw (unscaled no offset etc.) electric conductivity reading that | ||
| can be processed to siemens per meter. | ||
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,54 +1,41 @@ | ||
| What: /sys/bus/iio/devices/iio:deviceX/tia_resistanceY | ||
| /sys/bus/iio/devices/iio:deviceX/tia_capacitanceY | ||
| Date: December 2015 | ||
| KernelVersion: | ||
| Contact: Andrew F. Davis <[email protected]> | ||
| Description: | ||
| Get and set the resistance and the capacitance settings for the | ||
| Transimpedance Amplifier. Y is 1 for Rf1 and Cf1, Y is 2 for | ||
| Rf2 and Cf2 values. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/tia_separate_en | ||
| Date: December 2015 | ||
| KernelVersion: | ||
| Contact: Andrew F. Davis <[email protected]> | ||
| Description: | ||
| Enable or disable separate settings for the TransImpedance | ||
| Amplifier above, when disabled both values are set by the | ||
| first channel. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ledY_raw | ||
| /sys/bus/iio/devices/iio:deviceX/in_intensity_ledY_ambient_raw | ||
| Date: December 2015 | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_raw | ||
| Date: May 2016 | ||
| KernelVersion: | ||
| Contact: Andrew F. Davis <[email protected]> | ||
| Description: | ||
| Get measured values from the ADC for these stages. Y is the | ||
| specific LED number. The values are expressed in 24-bit twos | ||
| complement. | ||
| specific stage number corresponding to datasheet stage names | ||
| as follows: | ||
| 1 -> LED2 | ||
| 2 -> ALED2/LED3 | ||
| 3 -> LED1 | ||
| 4 -> ALED1/LED4 | ||
| Note that channels 5 and 6 represent LED2-ALED2 and LED1-ALED1 | ||
| respectively which simply helper channels containing the | ||
| calculated difference in the value of stage 1 - 2 and 3 - 4. | ||
| The values are expressed in 24-bit twos complement. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ledY-ledY_ambient_raw | ||
| Date: December 2015 | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_offset | ||
| Date: May 2016 | ||
| KernelVersion: | ||
| Contact: Andrew F. Davis <[email protected]> | ||
| Description: | ||
| Get differential values from the ADC for these stages. Y is the | ||
| specific LED number. The values are expressed in 24-bit twos | ||
| complement for the specified LEDs. | ||
| Get and set the offset cancellation DAC setting for these | ||
| stages. The values are expressed in 5-bit sign-magnitude. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/out_current_ledY_offset | ||
| /sys/bus/iio/devices/iio:deviceX/out_current_ledY_ambient_offset | ||
| Date: December 2015 | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_resistance | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_capacitance | ||
| Date: May 2016 | ||
| KernelVersion: | ||
| Contact: Andrew F. Davis <[email protected]> | ||
| Description: | ||
| Get and set the offset cancellation DAC setting for these | ||
| stages. The values are expressed in 5-bit sign-magnitude. | ||
| Get and set the resistance and the capacitance settings for the | ||
| Transimpedance Amplifier during the associated stage. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/out_current_ledY_raw | ||
| Date: December 2015 | ||
| What: /sys/bus/iio/devices/iio:deviceX/out_currentY_raw | ||
| Date: May 2016 | ||
| KernelVersion: | ||
| Contact: Andrew F. Davis <[email protected]> | ||
| Description: | ||
| Get and set the LED current for the specified LED. Y is the | ||
| specific LED number. | ||
| Get and set the LED current for the specified LED active during | ||
| this stage. Y is the specific stage number. |
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
41 changes: 41 additions & 0 deletions
41
Documentation/devicetree/bindings/iio/adc/brcm,iproc-static-adc.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,41 @@ | ||
| * Broadcom's IPROC Static ADC controller | ||
|
|
||
| Broadcom iProc ADC controller has 8 channels 10bit ADC. | ||
| Allows user to convert analog input voltage values to digital. | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible: Must be "brcm,iproc-static-adc" | ||
|
|
||
| - adc-syscon: Handler of syscon node defining physical base address of the | ||
| controller and length of memory mapped region. | ||
|
|
||
| - #io-channel-cells = <1>; As ADC has multiple outputs | ||
| refer to Documentation/devicetree/bindings/iio/iio-bindings.txt for details. | ||
|
|
||
| - io-channel-ranges: | ||
| refer to Documentation/devicetree/bindings/iio/iio-bindings.txt for details. | ||
|
|
||
| - clocks: Clock used for this block. | ||
|
|
||
| - clock-names: Clock name should be given as tsc_clk. | ||
|
|
||
| - interrupts: interrupt line number. | ||
|
|
||
| For example: | ||
|
|
||
| ts_adc_syscon: ts_adc_syscon@180a6000 { | ||
| compatible = "brcm,iproc-ts-adc-syscon","syscon"; | ||
| reg = <0x180a6000 0xc30>; | ||
| }; | ||
|
|
||
| adc: adc@180a6000 { | ||
| compatible = "brcm,iproc-static-adc"; | ||
| adc-syscon = <&ts_adc_syscon>; | ||
| #io-channel-cells = <1>; | ||
| io-channel-ranges; | ||
| clocks = <&asiu_clks BCM_CYGNUS_ASIU_ADC_CLK>; | ||
| clock-names = "tsc_clk"; | ||
| interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>; | ||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| * Maxim 1x3x/136x/116xx Analog to Digital Converter (ADC) | ||
|
|
||
| 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: Should be one of | ||
| "maxim,max1361" | ||
| "maxim,max1362" | ||
| "maxim,max1363" | ||
| "maxim,max1364" | ||
| "maxim,max1036" | ||
| "maxim,max1037" | ||
| "maxim,max1038" | ||
| "maxim,max1039" | ||
| "maxim,max1136" | ||
| "maxim,max1137" | ||
| "maxim,max1138" | ||
| "maxim,max1139" | ||
| "maxim,max1236" | ||
| "maxim,max1237" | ||
| "maxim,max1238" | ||
| "maxim,max1239" | ||
| "maxim,max11600" | ||
| "maxim,max11601" | ||
| "maxim,max11602" | ||
| "maxim,max11603" | ||
| "maxim,max11604" | ||
| "maxim,max11605" | ||
| "maxim,max11606" | ||
| "maxim,max11607" | ||
| "maxim,max11608" | ||
| "maxim,max11609" | ||
| "maxim,max11610" | ||
| "maxim,max11611" | ||
| "maxim,max11612" | ||
| "maxim,max11613" | ||
| "maxim,max11614" | ||
| "maxim,max11615" | ||
| "maxim,max11616" | ||
| "maxim,max11617" | ||
| "maxim,max11644" | ||
| "maxim,max11645" | ||
| "maxim,max11646" | ||
| "maxim,max11647" | ||
| - reg: Should contain the ADC I2C address | ||
|
|
||
| Optional properties: | ||
| - vcc-supply: phandle to the regulator that provides power to the ADC. | ||
| - vref-supply: phandle to the regulator for ADC reference voltage. | ||
| - interrupts: IRQ line for the ADC. If not used the driver will use | ||
| polling. | ||
|
|
||
| Example: | ||
| adc: max11644@36 { | ||
| compatible = "maxim,max11644"; | ||
| reg = <0x36>; | ||
| vref-supply = <&adc_vref>; | ||
| }; |
22 changes: 22 additions & 0 deletions
22
Documentation/devicetree/bindings/iio/chemical/atlas,ec-sm.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,22 @@ | ||
| * Atlas Scientific EC-SM OEM sensor | ||
|
|
||
| http://www.atlas-scientific.com/_files/_datasheets/_oem/EC_oem_datasheet.pdf | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible: must be "atlas,ec-sm" | ||
| - reg: the I2C address of the sensor | ||
| - interrupt-parent: should be the phandle for the interrupt controller | ||
| - interrupts: the sole interrupt generated by the device | ||
|
|
||
| Refer to interrupt-controller/interrupts.txt for generic interrupt client | ||
| node bindings. | ||
|
|
||
| Example: | ||
|
|
||
| atlas@64 { | ||
| compatible = "atlas,ec-sm"; | ||
| reg = <0x64>; | ||
| interrupt-parent = <&gpio1>; | ||
| interrupts = <16 2>; | ||
| }; |
Oops, something went wrong.