diff options
| author | Mark Brown <broonie@linaro.org> | 2014-04-10 18:39:52 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-10 18:39:52 -0400 |
| commit | 09c0998efcb4a23e27c297f48309e0b2abc76563 (patch) | |
| tree | e2c1d589095af11d2a56239df9beb7ddad566f67 | |
| parent | 455c6fdbd219161bd09b1165f11699d6d73de11c (diff) | |
| parent | 45b15d98a96ffdb3c608bdad952f51930c151420 (diff) | |
Merge tag 'spi-v3.15' into spi-linus
spi: Updates for v3.15
A busy release for both cleanups and new drivers this time along with
further factoring out of replicated code into the core:
- Provide support in the core for DMA mapping transfers - essentially
all drivers weren't implementing this properly, now there's no
excuse.
- Dual and quad mode support for spidev.
- Fix handling of cs_change in the generic implementation.
- Remove the S3C_DMA code from the s3c64xx driver now that all the
platforms using it have been converted to dmaengine.
- Lots of improvements to the Renesas SPI controllers.
- Drivers for Allwinner A10 and A31, Qualcomm QUP and Xylinx xtfpga.
- Removal of the bitrotted ti-ssp driver.
# gpg: Signature made Mon 31 Mar 2014 12:03:09 BST using RSA key ID 7EA229BD
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg: aka "Mark Brown <broonie@debian.org>"
# gpg: aka "Mark Brown <broonie@kernel.org>"
# gpg: aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg: aka "Mark Brown <broonie@linaro.org>"
# gpg: aka "Mark Brown <Mark.Brown@linaro.org>"
87 files changed, 4129 insertions, 2298 deletions
diff --git a/Documentation/devicetree/bindings/spi/efm32-spi.txt b/Documentation/devicetree/bindings/spi/efm32-spi.txt index a590ca51be75..8f081c96a4fa 100644 --- a/Documentation/devicetree/bindings/spi/efm32-spi.txt +++ b/Documentation/devicetree/bindings/spi/efm32-spi.txt | |||
| @@ -3,24 +3,24 @@ | |||
| 3 | Required properties: | 3 | Required properties: |
| 4 | - #address-cells: see spi-bus.txt | 4 | - #address-cells: see spi-bus.txt |
| 5 | - #size-cells: see spi-bus.txt | 5 | - #size-cells: see spi-bus.txt |
| 6 | - compatible: should be "efm32,spi" | 6 | - compatible: should be "energymicro,efm32-spi" |
| 7 | - reg: Offset and length of the register set for the controller | 7 | - reg: Offset and length of the register set for the controller |
| 8 | - interrupts: pair specifying rx and tx irq | 8 | - interrupts: pair specifying rx and tx irq |
| 9 | - clocks: phandle to the spi clock | 9 | - clocks: phandle to the spi clock |
| 10 | - cs-gpios: see spi-bus.txt | 10 | - cs-gpios: see spi-bus.txt |
| 11 | - location: Value to write to the ROUTE register's LOCATION bitfield to configure the pinmux for the device, see datasheet for values. | 11 | - efm32,location: Value to write to the ROUTE register's LOCATION bitfield to configure the pinmux for the device, see datasheet for values. |
| 12 | 12 | ||
| 13 | Example: | 13 | Example: |
| 14 | 14 | ||
| 15 | spi1: spi@0x4000c400 { /* USART1 */ | 15 | spi1: spi@0x4000c400 { /* USART1 */ |
| 16 | #address-cells = <1>; | 16 | #address-cells = <1>; |
| 17 | #size-cells = <0>; | 17 | #size-cells = <0>; |
| 18 | compatible = "efm32,spi"; | 18 | compatible = "energymicro,efm32-spi"; |
| 19 | reg = <0x4000c400 0x400>; | 19 | reg = <0x4000c400 0x400>; |
| 20 | interrupts = <15 16>; | 20 | interrupts = <15 16>; |
| 21 | clocks = <&cmu 20>; | 21 | clocks = <&cmu 20>; |
| 22 | cs-gpios = <&gpio 51 1>; // D3 | 22 | cs-gpios = <&gpio 51 1>; // D3 |
| 23 | location = <1>; | 23 | efm32,location = <1>; |
| 24 | status = "ok"; | 24 | status = "ok"; |
| 25 | 25 | ||
| 26 | ks8851@0 { | 26 | ks8851@0 { |
diff --git a/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt b/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt new file mode 100644 index 000000000000..b82a268f1bd4 --- /dev/null +++ b/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt | |||
| @@ -0,0 +1,85 @@ | |||
| 1 | Qualcomm Universal Peripheral (QUP) Serial Peripheral Interface (SPI) | ||
| 2 | |||
| 3 | The QUP core is an AHB slave that provides a common data path (an output FIFO | ||
| 4 | and an input FIFO) for serial peripheral interface (SPI) mini-core. | ||
