-
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.12-rc1' of git://git.kernel.org/pub/scm/linux/ke…
…rnel/git/gregkh/staging Pull staging/IIO updates from Greg KH: "Here is the big staging tree update for 4.12-rc1. It's a big one, adding about 350k new lines of crap^Wcode, mostly all in a big dump of media drivers from Intel. But there's other new drivers in here as well, yet-another-wifi driver, new IIO drivers, and a new crypto accelerator. We also deleted a bunch of stuff, mostly in patch cleanups, but also the Android ION code has shrunk a lot, and the Android low memory killer driver was finally deleted, much to the celebration of the -mm developers. All of these have been in linux-next with a few build issues that will show up when you merge to your tree" Merge conflicts in the new rtl8723bs driver (due to the wifi changes this merge window) handled as per linux-next, courtesy of Stephen Rothwell. * tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1182 commits) staging: fsl-mc/dpio: add cpu <--> LE conversion for dpaa2_fd staging: ks7010: remove line continuations in quoted strings staging: vt6656: use tabs instead of spaces staging: android: ion: Fix unnecessary initialization of static variable staging: media: atomisp: fix range checking on clk_num staging: media: atomisp: fix misspelled word in comment staging: media: atomisp: kmap() can't fail staging: atomisp: remove #ifdef for runtime PM functions staging: atomisp: satm include directory is gone atomisp: remove some more unused files atomisp: remove hmm_load/store/clear indirections atomisp: kill off mmgr_free atomisp: clean up the hmm init/cleanup indirections atomisp: handle allocation calls before init in the hmm layer staging: fsl-dpaa2/eth: Add maintainer for Ethernet driver staging: fsl-dpaa2/eth: Add TODO file staging: fsl-dpaa2/eth: Add trace points staging: fsl-dpaa2/eth: Add driver specific stats staging: fsl-dpaa2/eth: Add ethtool support staging: fsl-dpaa2/eth: Add Freescale DPAA2 Ethernet driver ...
- Loading branch information
Showing
1,787 changed files
with
359,290 additions
and
15,278 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
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,17 @@ | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_power_shunt_resistor | ||
| Date: March 2017 | ||
| KernelVersion: 4.12 | ||
| Contact: linux-iio@vger.kernel.org | ||
| Description: The value of the shunt resistor used to compute power drain on | ||
| common input voltage pin (RS+). In Ohms. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_current_shunt_resistor | ||
| Date: March 2017 | ||
| KernelVersion: 4.12 | ||
| Contact: linux-iio@vger.kernel.org | ||
| Description: The value of the shunt resistor used to compute current flowing | ||
| between RS+ and RS- voltage sense inputs. In Ohms. | ||
|
|
||
| These attributes describe a single physical component, exposed as two distinct | ||
| attributes as it is used to calculate two different values: power load and | ||
| current flowing between RS+ and RS- inputs. |
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,38 @@ | ||
| Analog Devices ADXL345 3-Axis, +/-(2g/4g/8g/16g) Digital Accelerometer | ||
|
|
||
| http://www.analog.com/en/products/mems/accelerometers/adxl345.html | ||
|
|
||
| Required properties: | ||
| - compatible : should be "adi,adxl345" | ||
| - reg : the I2C address or SPI chip select number of the sensor | ||
|
|
||
| Required properties for SPI bus usage: | ||
| - spi-max-frequency : set maximum clock frequency, must be 5000000 | ||
| - spi-cpol and spi-cpha : must be defined for adxl345 to enable SPI mode 3 | ||
|
|
||
| Optional properties: | ||
| - interrupt-parent : phandle to the parent interrupt controller as documented | ||
| in Documentation/devicetree/bindings/interrupt-controller/interrupts.txt | ||
| - interrupts: interrupt mapping for IRQ as documented in | ||
| Documentation/devicetree/bindings/interrupt-controller/interrupts.txt | ||
|
|
||
| Example for a I2C device node: | ||
|
|
||
| accelerometer@2a { | ||
| compatible = "adi,adxl345"; | ||
| reg = <0x53>; | ||
| interrupt-parent = <&gpio1>; | ||
| interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; | ||
| }; | ||
|
|
||
| Example for a SPI device node: | ||
|
|
||
| accelerometer@0 { | ||
| compatible = "adi,adxl345"; | ||
| reg = <0>; | ||
| spi-max-frequency = <5000000>; | ||
| spi-cpol; | ||
| spi-cpha; | ||
| interrupt-parent = <&gpio1>; | ||
| interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; | ||
| }; |
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,20 @@ | ||
| Aspeed ADC | ||
|
|
||
| This device is a 10-bit converter for 16 voltage channels. All inputs are | ||
| single ended. | ||
|
|
||
| Required properties: | ||
| - compatible: Should be "aspeed,ast2400-adc" or "aspeed,ast2500-adc" | ||
| - reg: memory window mapping address and length | ||
| - clocks: Input clock used to derive the sample clock. Expected to be the | ||
| SoC's APB clock. | ||
| - #io-channel-cells: Must be set to <1> to indicate channels are selected | ||
| by index. | ||
|
|
||
| Example: | ||
| adc@1e6e9000 { | ||
| compatible = "aspeed,ast2400-adc"; | ||
| reg = <0x1e6e9000 0xb0>; | ||
| clocks = <&clk_apb>; | ||
| #io-channel-cells = <1>; | ||
| }; |
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,18 @@ | ||
| Motorola CPCAP PMIC ADC binding | ||
|
|
||
| Required properties: | ||
| - compatible: Should be "motorola,cpcap-adc" or "motorola,mapphone-cpcap-adc" | ||
| - interrupt-parent: The interrupt controller | ||
| - interrupts: The interrupt number for the ADC device | ||
| - interrupt-names: Should be "adcdone" | ||
| - #io-channel-cells: Number of cells in an IIO specifier | ||
|
|
||
| Example: | ||
|
|
||
| cpcap_adc: adc { | ||
| compatible = "motorola,mapphone-cpcap-adc"; | ||
| interrupt-parent = <&cpcap>; | ||
| interrupts = <8 IRQ_TYPE_NONE>; | ||
| interrupt-names = "adcdone"; | ||
| #io-channel-cells = <1>; | ||
| }; |
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 @@ | ||
| * Linear Technology / Analog Devices LTC2497 ADC | ||
|
|
||
| Required properties: | ||
| - compatible: Must be "lltc,ltc2497" | ||
| - reg: Must contain the ADC I2C address | ||
| - vref-supply: The regulator supply for ADC reference voltage | ||
|
|
||
| Example: | ||
| ltc2497: adc@76 { | ||
| compatible = "lltc,ltc2497"; | ||
| reg = <0x76>; | ||
| vref-supply = <<c2497_reg>; | ||
| }; |
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 @@ | ||
| * MAX1117/MAX1118/MAX1119 8-bit, dual-channel ADCs | ||
|
|
||
| Required properties: | ||
| - compatible: Should be one of | ||
| * "maxim,max1117" | ||
| * "maxim,max1118" | ||
| * "maxim,max1119" | ||
| - reg: spi chip select number for the device | ||
| - (max1118 only) vref-supply: The regulator supply for ADC reference voltage | ||
|
|
||
| Recommended properties: | ||
| - spi-max-frequency: Definition as per | ||
| Documentation/devicetree/bindings/spi/spi-bus.txt | ||
|
|
||
| Example: | ||
| adc@0 { | ||
| compatible = "maxim,max1118"; | ||
| reg = <0>; | ||
| vref-supply = <&vdd_supply>; | ||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| * Maxim max9611/max9612 current sense amplifier with 12-bits ADC interface | ||
|
|
||
| Maxim max9611/max9612 is an high-side current sense amplifier with integrated | ||
| 12-bits ADC communicating over I2c bus. | ||
| The device node for this driver shall be a child of a I2c controller. | ||
|
|
||
| Required properties | ||
| - compatible: Should be "maxim,max9611" or "maxim,max9612" | ||
| - reg: The 7-bits long I2c address of the device | ||
| - shunt-resistor-micro-ohms: Value, in micro Ohms, of the current sense shunt | ||
| resistor | ||
|
|
||
| Example: | ||
|
|
||
| &i2c4 { | ||
| csa: adc@7c { | ||
| compatible = "maxim,max9611"; | ||
| reg = <0x7c>; | ||
|
|
||
| shunt-resistor-micro-ohms = <5000>; | ||
| }; | ||
| }; | ||
|
|
||
| This device node describes a current sense amplifier sitting on I2c4 bus | ||
| with address 0x7c (read address is 0xf9, write address is 0xf8). | ||
| A sense resistor of 0,005 Ohm is installed between RS+ and RS- current-sensing | ||
| inputs. |
Oops, something went wrong.