-
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 'spi-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/gi…
…t/broonie/spi Pull spi updates from Mark Brown: "A fairly quiet release for SPI, mainly driver work. A few highlights: - Supports bits per word compatibility checking in the core. - Allow use of the IP used in Freescale SPI controllers outside Freescale SoCs. - DMA support for the Atmel SPI driver. - New drivers for the BCM2835 and Tegra114" * tag 'spi-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (68 commits) spi-topcliff-pch: fix to use list_for_each_entry_safe() when delete list items spi-topcliff-pch: missing platform_driver_unregister() on error in pch_spi_init() ARM: dts: add pinctrl property for spi node for atmel SoC ARM: dts: add spi nodes for the atmel boards ARM: dts: add spi nodes for atmel SoC ARM: at91: add clocks for spi dt entries spi/spi-atmel: add dmaengine support spi/spi-atmel: add flag to controller data for lock operations spi/spi-atmel: add physical base address spi/sirf: fix MODULE_DEVICE_TABLE MAINTAINERS: Add git repository and update my address spi/s3c64xx: Check for errors in dmaengine prepare_transfer() spi/s3c64xx: Fix non-dmaengine usage spi: omap2-mcspi: fix error return code in omap2_mcspi_probe() spi/s3c64xx: let device core setup the default pin configuration MAINTAINERS: Update Grant's email address and maintainership spi: omap2-mcspi: Fix transfers if DMADEVICES is not set spi: s3c64xx: move to generic dmaengine API spi-gpio: init CS before spi_bitbang_setup() spi: spi-mpc512x-psc: let transmiter/receiver enabled when in xfer loop ...
- Loading branch information
Showing
53 changed files
with
3,711 additions
and
892 deletions.
There are no files selected for viewing
22 changes: 22 additions & 0 deletions
22
Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.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,22 @@ | ||
Broadcom BCM2835 SPI0 controller | ||
|
||
The BCM2835 contains two forms of SPI master controller, one known simply as | ||
SPI0, and the other known as the "Universal SPI Master"; part of the | ||
auxilliary block. This binding applies to the SPI0 controller. | ||
|
||
Required properties: | ||
- compatible: Should be "brcm,bcm2835-spi". | ||
- reg: Should contain register location and length. | ||
- interrupts: Should contain interrupt. | ||
- clocks: The clock feeding the SPI controller. | ||
|
||
Example: | ||
|
||
spi@20204000 { | ||
compatible = "brcm,bcm2835-spi"; | ||
reg = <0x7e204000 0x1000>; | ||
interrupts = <2 22>; | ||
clocks = <&clk_spi>; | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
}; |
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
26 changes: 26 additions & 0 deletions
26
Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.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 @@ | ||
NVIDIA Tegra114 SPI controller. | ||
|
||
Required properties: | ||
- compatible : should be "nvidia,tegra114-spi". | ||
- reg: Should contain SPI registers location and length. | ||
- interrupts: Should contain SPI interrupts. | ||
- nvidia,dma-request-selector : The Tegra DMA controller's phandle and | ||
request selector for this SPI controller. | ||
- This is also require clock named "spi" as per binding document | ||
Documentation/devicetree/bindings/clock/clock-bindings.txt | ||
|
||
Recommended properties: | ||
- spi-max-frequency: Definition as per | ||
Documentation/devicetree/bindings/spi/spi-bus.txt | ||
Example: | ||
|
||
spi@7000d600 { | ||
compatible = "nvidia,tegra114-spi"; | ||
reg = <0x7000d600 0x200>; | ||
interrupts = <0 82 0x04>; | ||
nvidia,dma-request-selector = <&apbdma 16>; | ||
spi-max-frequency = <25000000>; | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
status = "disabled"; | ||
}; |
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
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
Oops, something went wrong.