-
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.19-rc1' of git://git.kernel.org/pub/scm/linux/ke…
…rnel/git/gregkh/staging Pull staging and IIO updates from Greg KH: "Here are the big staging/iio patches for 4.19-rc1. Lots of churn here, with tons of cleanups happening in staging drivers, a removal of an old crypto driver that no one was using (skein), and the addition of some new IIO drivers. Also added was a "gasket" driver from Google that needs loads of work and the erofs filesystem. Even with adding all of the new drivers and a new filesystem, we are only adding about 1000 lines overall to the kernel linecount, which shows just how much cleanup happened, and how big the unused crypto driver was. All of these have been in the linux-next tree for a while now with no reported issues" * tag 'staging-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (903 commits) staging:rtl8192u: Remove unused macro definitions - Style staging:rtl8192u: Add spaces around '+' operator - Style staging:rtl8192u: Remove stale comment - Style staging: rtl8188eu: remove unused mp_custom_oid.h staging: fbtft: Add spaces around / - Style staging: fbtft: Erases some repetitive usage of function name - Style staging: fbtft: Adjust some empty-line problems - Style staging: fbtft: Removes one nesting level to help readability - Style staging: fbtft: Changes gamma table to define. staging: fbtft: A bit more information on dev_err. staging: fbtft: Fixes some alignment issues - Style staging: fbtft: Puts macro arguments in parenthesis to avoid precedence issues - Style staging: rtl8188eu: remove unused array dB_Invert_Table staging: rtl8188eu: remove whitespace, add missing blank line staging: rtl8188eu: use is_multicast_ether_addr in rtw_sta_mgt.c staging: rtl8188eu: remove whitespace - style staging: rtl8188eu: cleanup block comment - style staging: rtl8188eu: use is_multicast_ether_addr in rtl8188eu_xmit.c staging: rtl8188eu: use is_multicast_ether_addr in recv_linux.c staging: rtlwifi: refactor rtl_get_tcb_desc ...
- Loading branch information
Showing
466 changed files
with
28,224 additions
and
27,630 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
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,47 @@ | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_agc_gain | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_agc_gain_bias | ||
| KernelVersion: 4.18 | ||
| Contact: linux-iio@vger.kernel.org | ||
| Description: | ||
| This sensor has an automatic gain control (agc) loop | ||
| which sets the analog signal levels at an optimum | ||
| level by controlling programmable gain amplifiers. The | ||
| criteria for optimal gain is determined by the sensor. | ||
|
|
||
| Return the actual gain value as an integer in [0; 65536] | ||
| range when read from. | ||
|
|
||
| The agc gain read when measuring crosstalk shall be | ||
| written into in_proximity0_agc_gain_bias. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calib_phase_temp_a | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calib_phase_temp_b | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calib_phase_light_a | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calib_phase_light_b | ||
| KernelVersion: 4.18 | ||
| Contact: linux-iio@vger.kernel.org | ||
| Description: | ||
| The sensor is able to perform correction of distance | ||
| measurements due to changing temperature and ambient | ||
| light conditions. It can be programmed to correct for | ||
| a second order error polynomial. | ||
|
|
||
| Phase data has to be collected when temperature and | ||
| ambient light are modulated independently. | ||
|
|
||
| Then a least squares curve fit to a second order | ||
| polynomial has to be generated from the data. The | ||
| resultant curves have the form ax^2 + bx + c. | ||
|
|
||
| From those two curves, a and b coefficients shall be | ||
| stored in in_proximity0_calib_phase_temp_a and | ||
| in_proximity0_calib_phase_temp_b for temperature and | ||
| in in_proximity0_calib_phase_light_a and | ||
| in_proximity0_calib_phase_light_b for ambient light. | ||
|
|
||
| Those values must be integer in [0; 8355840] range. | ||
|
|
||
| Finally, the c constant is set by the sensor | ||
| internally. | ||
|
|
||
| The value stored in sensor is displayed when read from. |
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 @@ | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ir_small_raw | ||
| KernelVersion: 4.18 | ||
| Contact: linux-iio@vger.kernel.org | ||
| Description: | ||
| Unit-less infrared intensity. The intensity is measured from 1 | ||
| dark photodiode. "small" indicate the surface area capturing | ||
| infrared. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ir_large_raw | ||
| KernelVersion: 4.18 | ||
| Contact: linux-iio@vger.kernel.org | ||
| Description: | ||
| Unit-less infrared intensity. The intensity is measured from 4 | ||
| dark photodiodes. "large" indicate the surface area capturing | ||
| infrared. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensity_large_raw | ||
| KernelVersion: 4.18 | ||
| Contact: linux-iio@vger.kernel.org | ||
| Description: | ||
| Unit-less light intensity with more diodes. | ||
|
|
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
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
36 changes: 36 additions & 0 deletions
36
Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-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,36 @@ | ||
| Spreadtrum SC27XX series PMICs ADC binding | ||
|
|
||
| Required properties: | ||
| - compatible: Should be one of the following. | ||
| "sprd,sc2720-adc" | ||
| "sprd,sc2721-adc" | ||
| "sprd,sc2723-adc" | ||
| "sprd,sc2730-adc" | ||
| "sprd,sc2731-adc" | ||
| - reg: The address offset of ADC controller. | ||
| - interrupt-parent: The interrupt controller. | ||
| - interrupts: The interrupt number for the ADC device. | ||
| - #io-channel-cells: Number of cells in an IIO specifier. | ||
| - hwlocks: Reference to a phandle of a hwlock provider node. | ||
|
|
||
| Example: | ||
|
|
||
| sc2731_pmic: pmic@0 { | ||
| compatible = "sprd,sc2731"; | ||
| reg = <0>; | ||
| spi-max-frequency = <26000000>; | ||
| interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; | ||
| interrupt-controller; | ||
| #interrupt-cells = <2>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
|
|
||
| pmic_adc: adc@480 { | ||
| compatible = "sprd,sc2731-adc"; | ||
| reg = <0x480>; | ||
| interrupt-parent = <&sc2731_pmic>; | ||
| interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; | ||
| #io-channel-cells = <1>; | ||
| hwlocks = <&hwlock 4>; | ||
| }; | ||
| }; |
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,78 @@ | ||
| Analog Devices AD5758 DAC device driver | ||
|
|
||
| Required properties for the AD5758: | ||
| - compatible: Must be "adi,ad5758" | ||
| - reg: SPI chip select number for the device | ||
| - spi-max-frequency: Max SPI frequency to use (< 50000000) | ||
| - spi-cpha: is the only mode that is supported | ||
|
|
||
| Required properties: | ||
|
|
||
| - adi,dc-dc-mode: Mode of operation of the dc-to-dc converter | ||
| Dynamic Power Control (DPC) | ||
| In this mode, the AD5758 circuitry senses the output | ||
| voltage and dynamically regulates the supply voltage, | ||
| VDPC+, to meet compliance requirements plus an optimized | ||
| headroom voltage for the output buffer. | ||
|
|
||
| Programmable Power Control (PPC) | ||
| In this mode, the VDPC+ voltage is user-programmable to | ||
| a fixed level that needs to accommodate the maximum output | ||
| load required. | ||
|
|
||
| The output of the DAC core is either converted to a | ||
| current or voltage output at the VIOUT pin. Only one mode | ||
| can be enabled at any one time. | ||
|
|
||
| The following values are currently supported: | ||
| * 1: DPC current mode | ||
| * 2: DPC voltage mode | ||
| * 3: PPC current mode | ||
|
|
||
| Depending on the selected output mode (voltage or current) one of the | ||
| two properties must | ||
| be present: | ||
|
|
||
| - adi,range-microvolt: Voltage output range | ||
| The array of voltage output ranges must contain two fields: | ||
| * <0 5000000>: 0 V to 5 V voltage range | ||
| * <0 10000000>: 0 V to 10 V voltage range | ||
| * <(-5000000) 5000000>: ±5 V voltage range | ||
| * <(-10000000) 10000000>: ±10 V voltage range | ||
| - adi,range-microamp: Current output range | ||
| The array of current output ranges must contain two fields: | ||
| * <0 20000>: 0 mA to 20 mA current range | ||
| * <0 24000>: 0 mA to 24 mA current range | ||
| * <4 24000>: 4 mA to 20 mA current range | ||
| * <(-20000) 20000>: ±20 mA current range | ||
| * <(-24000) 24000>: ±24 mA current range | ||
| * <(-1000) 22000>: −1 mA to +22 mA current range | ||
|
|
||
| Optional properties: | ||
|
|
||
| - adi,dc-dc-ilim-microamp: The dc-to-dc converter current limit | ||
| The following values are currently supported [uA]: | ||
| * 150000 | ||
| * 200000 | ||
| * 250000 | ||
| * 300000 | ||
| * 350000 | ||
| * 400000 | ||
|
|
||
| - adi,slew-time-us: The time it takes for the output to reach the | ||
| full scale [uS] | ||
| The supported range is between 133us up to 1023984375us | ||
|
|
||
| AD5758 Example: | ||
|
|
||
| dac@0 { | ||
| compatible = "adi,ad5758"; | ||
| reg = <0>; | ||
| spi-max-frequency = <1000000>; | ||
| spi-cpha; | ||
|
|
||
| adi,dc-dc-mode = <2>; | ||
| adi,range-microvolt = <0 10000000>; | ||
| adi,dc-dc-ilim-microamp = <200000>; | ||
| adi,slew-time-us = <125000>; | ||
| }; |
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,13 @@ | ||
| * ISL29501 Time-of-flight sensor. | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible : should be "renesas,isl29501" | ||
| - reg : the I2C address of the sensor | ||
|
|
||
| Example: | ||
|
|
||
| isl29501@57 { | ||
| compatible = "renesas,isl29501"; | ||
| reg = <0x57>; | ||
| }; |
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
30 changes: 30 additions & 0 deletions
30
Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.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,30 @@ | ||
| Generic resistive touchscreen ADC | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible: must be "resistive-adc-touch" | ||
| The device must be connected to an ADC device that provides channels for | ||
| position measurement and optional pressure. | ||
| Refer to ../iio/iio-bindings.txt for details | ||
| - iio-channels: must have at least two channels connected to an ADC device. | ||
| These should correspond to the channels exposed by the ADC device and should | ||
| have the right index as the ADC device registers them. These channels | ||
| represent the relative position on the "x" and "y" axes. | ||
| - iio-channel-names: must have all the channels' names. Mandatory channels | ||
| are "x" and "y". | ||
|
|
||
| Optional properties: | ||
| - iio-channels: The third channel named "pressure" is optional and can be | ||
| used if the ADC device also measures pressure besides position. | ||
| If this channel is missing, pressure will be ignored and the touchscreen | ||
| will only report position. | ||
| - iio-channel-names: optional channel named "pressure". | ||
|
|
||
| Example: | ||
|
|
||
| resistive_touch: resistive_touch { | ||
| compatible = "resistive-adc-touch"; | ||
| touchscreen-min-pressure = <50000>; | ||
| io-channels = <&adc 24>, <&adc 25>, <&adc 26>; | ||
| io-channel-names = "x", "y", "pressure"; | ||
| }; |
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.