-
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.5-rc1' of git://git.kernel.org/pub/scm/linux/ker…
…nel/git/gregkh/staging Pull staging tree changes from Greg Kroah-Hartman: "Here is the big staging tree pull request for the 3.5-rc1 merge window. Loads of changes here, and we just narrowly added more lines than we added: 622 files changed, 28356 insertions(+), 26059 deletions(-) But, good news is that there is a number of subsystems that moved out of the staging tree, to their respective "real" portions of the kernel. Code that moved out was: - iio core code - mei driver - vme core and bridge drivers There was one broken network driver that moved into staging as a step before it is removed from the tree (pc300), and there was a few new drivers added to the tree: - new iio drivers - gdm72xx wimax USB driver - ipack subsystem and 2 drivers All of the movements around have acks from the various subsystem maintainers, and all of this has been in the linux-next tree for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fixed up various trivial conflicts, along with a non-trivial one found in -next and pointed out by Olof Johanssen: a clean - but incorrect - merge of the arch/arm/boot/dts/at91sam9g20.dtsi file. Fix up manually as per Stephen Rothwell. * tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits) Staging: bcm: Remove two unused variables from Adapter.h Staging: bcm: Removes the volatile type definition from Adapter.h Staging: bcm: Rename all "INT" to "int" in Adapter.h Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h Staging: bcm: Correctly format all comments in Adapter.h Staging: bcm: Fix all whitespace issues in Adapter.h Staging: bcm: Properly format braces in Adapter.h Staging: ipack/bridges/tpci200: remove unneeded casts Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant Staging: ipack: remove board_name and bus_name fields from struct ipack_device Staging: ipack: improve the register of a bus and a device in the bus. staging: comedi: cleanup all the comedi_driver 'detach' functions staging: comedi: remove all 'default N' in Kconfig staging: line6/config.h: Delete unused header staging: gdm72xx depends on NET staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices staging: drm/omap: initial dmabuf/prime import support staging: drm/omap: dmabuf/prime mmap support pstore/ram: Add ECC support pstore/ram: Switch to persistent_ram routines ...
- Loading branch information
Showing
611 changed files
with
28,159 additions
and
25,952 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 |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| obj-m := DocBook/ accounting/ auxdisplay/ connector/ \ | ||
| filesystems/ filesystems/configfs/ ia64/ laptops/ networking/ \ | ||
| pcmcia/ spi/ timers/ watchdog/src/ | ||
| pcmcia/ spi/ timers/ watchdog/src/ misc-devices/mei/ |
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,65 @@ | ||
| * AT91's Analog to Digital Converter (ADC) | ||
|
|
||
| Required properties: | ||
| - compatible: Should be "atmel,at91sam9260-adc" | ||
| - reg: Should contain ADC registers location and length | ||
| - interrupts: Should contain the IRQ line for the ADC | ||
| - atmel,adc-channel-base: Offset of the first channel data register | ||
| - atmel,adc-channels-used: Bitmask of the channels muxed and enable for this | ||
| device | ||
| - atmel,adc-drdy-mask: Mask of the DRDY interruption in the ADC | ||
| - atmel,adc-num-channels: Number of channels available in the ADC | ||
| - atmel,adc-startup-time: Startup Time of the ADC in microseconds as | ||
| defined in the datasheet | ||
| - atmel,adc-status-register: Offset of the Interrupt Status Register | ||
| - atmel,adc-trigger-register: Offset of the Trigger Register | ||
| - atmel,adc-vref: Reference voltage in millivolts for the conversions | ||
|
|
||
| Optional properties: | ||
| - atmel,adc-use-external: Boolean to enable of external triggers | ||
|
|
||
| Optional trigger Nodes: | ||
| - Required properties: | ||
| * trigger-name: Name of the trigger exposed to the user | ||
| * trigger-value: Value to put in the Trigger register | ||
| to activate this trigger | ||
| - Optional properties: | ||
| * trigger-external: Is the trigger an external trigger? | ||
|
|
||
| Examples: | ||
| adc0: adc@fffb0000 { | ||
| compatible = "atmel,at91sam9260-adc"; | ||
| reg = <0xfffb0000 0x100>; | ||
| interrupts = <20 4>; | ||
| atmel,adc-channel-base = <0x30>; | ||
| atmel,adc-channels-used = <0xff>; | ||
| atmel,adc-drdy-mask = <0x10000>; | ||
| atmel,adc-num-channels = <8>; | ||
| atmel,adc-startup-time = <40>; | ||
| atmel,adc-status-register = <0x1c>; | ||
| atmel,adc-trigger-register = <0x08>; | ||
| atmel,adc-use-external; | ||
| atmel,adc-vref = <3300>; | ||
|
|
||
| trigger@0 { | ||
| trigger-name = "external-rising"; | ||
| trigger-value = <0x1>; | ||
| trigger-external; | ||
| }; | ||
| trigger@1 { | ||
| trigger-name = "external-falling"; | ||
| trigger-value = <0x2>; | ||
| trigger-external; | ||
| }; | ||
|
|
||
| trigger@2 { | ||
| trigger-name = "external-any"; | ||
| trigger-value = <0x3>; | ||
| trigger-external; | ||
| }; | ||
|
|
||
| trigger@3 { | ||
| trigger-name = "continuous"; | ||
| trigger-value = <0x6>; | ||
| }; | ||
| }; |
16 changes: 16 additions & 0 deletions
16
Documentation/devicetree/bindings/staging/iio/adc/lpc32xx-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,16 @@ | ||
| * NXP LPC32xx SoC ADC controller | ||
|
|
||
| Required properties: | ||
| - compatible: must be "nxp,lpc3220-adc" | ||
| - reg: physical base address of the controller and length of memory mapped | ||
| region. | ||
| - interrupts: The ADC interrupt | ||
|
|
||
| Example: | ||
|
|
||
| adc@40048000 { | ||
| compatible = "nxp,lpc3220-adc"; | ||
| reg = <0x40048000 0x1000>; | ||
| interrupt-parent = <&mic>; | ||
| interrupts = <39 0>; | ||
| }; |
26 changes: 26 additions & 0 deletions
26
Documentation/devicetree/bindings/staging/iio/adc/spear-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,26 @@ | ||
| * ST SPEAr ADC device driver | ||
|
|
||
| Required properties: | ||
| - compatible: Should be "st,spear600-adc" | ||
| - reg: Address and length of the register set for the device | ||
| - interrupt-parent: Should be the phandle for the interrupt controller | ||
| that services interrupts for this device | ||
| - interrupts: Should contain the ADC interrupt | ||
| - sampling-frequency: Default sampling frequency | ||
|
|
||
| Optional properties: | ||
| - vref-external: External voltage reference in milli-volts. If omitted | ||
| the internal voltage reference will be used. | ||
| - average-samples: Number of samples to generate an average value. If | ||
| omitted, single data conversion will be used. | ||
|
|
||
| Examples: | ||
|
|
||
| adc: adc@d8200000 { | ||
| compatible = "st,spear600-adc"; | ||
| reg = <0xd8200000 0x1000>; | ||
| interrupt-parent = <&vic1>; | ||
| interrupts = <6>; | ||
| sampling-frequency = <5000000>; | ||
| vref-external = <2500>; /* 2.5V VRef */ | ||
| }; |
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 @@ | ||
| mei-amt-version |
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,8 @@ | ||
| # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| obj- := dummy.o | ||
|
|
||
| # List of programs to build | ||
| hostprogs-y := mei-amt-version | ||
| HOSTCFLAGS_mei-amt-version.o += -I$(objtree)/usr/include | ||
| # Tell kbuild to always build the programs | ||
| always := $(hostprogs-y) |
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,2 @@ | ||
| TODO: | ||
| - Cleanup and split the timer function |
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
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
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
Oops, something went wrong.