Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

spi-bcm2835: merge upstream patches allowing DMA transfers #1085

Merged
merged 7 commits into from
Jul 23, 2015
Merged

spi-bcm2835: merge upstream patches allowing DMA transfers #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f92bef3
spi: bcm2835: fallback to interrupt for polling timeouts exceeding 2 …
msperl Apr 22, 2015
1c10a60
spi: bcm2835: enable dma modes for transfers meeting certain conditions
msperl May 10, 2015
52b3a92
spi: bcm2835: fix kbuild compile warnings/errors and a typo
msperl May 12, 2015
242d4b1
spi: bcm2835: bcm2835_dma_release() can be static
May 12, 2015
92ee16a
spi: bcm2835: fixed compile issues due to embedded comments...
msperl Jul 22, 2015
6e4e1a7
dt-overlay to enable dma for spi driver
msperl Jul 22, 2015
89fc2d1
dt: overlay: added documentation of spi-dma overlay
msperl Jul 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arch/arm/boot/dts/overlays/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ dtb-$(RPI_DT_OVERLAYS) += rpi-sense-overlay.dtb
dtb-$(RPI_DT_OVERLAYS) += sdhost-overlay.dtb
dtb-$(RPI_DT_OVERLAYS) += spi-bcm2708-overlay.dtb
dtb-$(RPI_DT_OVERLAYS) += spi-bcm2835-overlay.dtb
dtb-$(RPI_DT_OVERLAYS) += spi-dma-overlay.dtb
dtb-$(RPI_DT_OVERLAYS) += tinylcd35-overlay.dtb
dtb-$(RPI_DT_OVERLAYS) += uart1-overlay.dtb
dtb-$(RPI_DT_OVERLAYS) += vga666-overlay.dtb
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/overlays/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,12 @@ Load: dtoverlay=spi-bcm2835
Params: <None>


Name: spi-dma
Info: enables dma modes for spi-bcm2835
Load: dtoverlay=spi-dma
Params: <None>


Name: tinylcd35
Info: 3.5" Color TFT Display by www.tinylcd.com
Options: Touch, RTC, keypad
Expand Down
20 changes: 20 additions & 0 deletions arch/arm/boot/dts/overlays/spi-dma-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Device tree overlay for spi-bcm2835 to allow dma
*/

/dts-v1/;
/plugin/;

/ {
compatible = "brcm,bcm2835", "brcm,bcm2836", "brcm,bcm2708", "brcm,bcm2709";

fragment@0 {
target = <&spi0>;
__overlay__ {
#address-cells = <1>;
#size-cells = <0>;
dmas = <&dma 6>, <&dma 7>;
dma-names = "tx", "rx";
};
};
};
Loading