-
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.1-rc1' of git://git.kernel.org/pub/scm/linux/ker…
…nel/git/gregkh/staging Pull staging driver updates from Greg KH: "Here's the big staging driver patchset for 4.1-rc1. There's a lot of patches here, the Outreachy application period happened during this development cycle, so that means that there was a lot of cleanup patches accepted. Other than the normal coding style and sparse fixes here, there are some driver updates and work toward making some of the drivers into "mergable" shape (like the Unisys drivers.) All of these have been in linux-next for a while" * tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1214 commits) staging: lustre: orthography & coding style staging: lustre: lnet: lnet: fix error return code staging: lustre: fix sparse warning Revert "Staging: sm750fb: Fix C99 Comments" Staging: rtl8192u: use correct array for debug output staging: rtl8192e: Remove dead code staging: rtl8192e: Comment cleanup (style/format) staging: rtl8192e: Fix indentation in rtllib_rx_auth_resp() staging: rtl8192e: Decrease nesting of rtllib_rx_auth_resp() staging: rtl8192e: Divide rtllib_rx_auth() staging: rtl8192e: Fix PRINTK_WITHOUT_KERN_LEVEL warnings staging: rtl8192e: Fix DO_WHILE_MACRO_WITH_TRAILING_SEMICOLON warning staging: rtl8192e: Fix BRACES warning staging: rtl8192e: Fix LINE_CONTINUATIONS warning staging: rtl8192e: Fix UNNECESSARY_PARENTHESES warnings staging: rtl8192e: remove unused EXPORT_SYMBOL_RSL macro staging: rtl8192e: Fix RETURN_VOID warnings staging: rtl8192e: Fix UNNECESSARY_ELSE warning staging: rtl8723au: Remove unneeded comments staging: rtl8723au: Use __func__ in trace logs ...
- Loading branch information
Showing
824 changed files
with
38,863 additions
and
22,325 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,30 @@ | ||
| * Microchip Analog to Digital Converter (ADC) | ||
|
|
||
| The node for this driver must be a child node of a SPI controller, hence | ||
| all mandatory properties described in | ||
|
|
||
| Documentation/devicetree/bindings/spi/spi-bus.txt | ||
|
|
||
| must be specified. | ||
|
|
||
| Required properties: | ||
| - compatible: Must be one of the following, depending on the | ||
| model: | ||
| "mcp3001" | ||
| "mcp3002" | ||
| "mcp3004" | ||
| "mcp3008" | ||
| "mcp3201" | ||
| "mcp3202" | ||
| "mcp3204" | ||
| "mcp3208" | ||
|
|
||
|
|
||
| Examples: | ||
| spi_controller { | ||
| mcp3x0x@0 { | ||
| compatible = "mcp3002"; | ||
| reg = <0>; | ||
| 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,17 @@ | ||
| * Microchip mcp3422/3/4/6/7/8 chip family (ADC) | ||
|
|
||
| Required properties: | ||
| - compatible: Should be | ||
| "microchip,mcp3422" or | ||
| "microchip,mcp3423" or | ||
| "microchip,mcp3424" or | ||
| "microchip,mcp3426" or | ||
| "microchip,mcp3427" or | ||
| "microchip,mcp3428" | ||
| - reg: I2C address for the device | ||
|
|
||
| Example: | ||
| adc@0 { | ||
| compatible = "microchip,mcp3424"; | ||
| reg = <0x68>; | ||
| }; |
18 changes: 18 additions & 0 deletions
18
Documentation/devicetree/bindings/iio/adc/ti-adc128s052.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,18 @@ | ||
| * Texas Instruments' ADC128S052 ADC chip | ||
|
|
||
| Required properties: | ||
| - compatible: Should be "ti,adc128s052" | ||
| - reg: spi chip select number for the device | ||
| - 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 = "ti,adc128s052"; | ||
| 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
Oops, something went wrong.