Skip to content

Commit 3230498

Browse files
committed
Merge pull request #1085 from msperl/rpi-4.0.y-spi-bcm2835-dma
spi-bcm2835: merge upstream patches allowing DMA transfers
2 parents 1e67c6f + 89fc2d1 commit 3230498

File tree

4 files changed

+382
-41
lines changed

4 files changed

+382
-41
lines changed

arch/arm/boot/dts/overlays/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ dtb-$(RPI_DT_OVERLAYS) += rpi-sense-overlay.dtb
4343
dtb-$(RPI_DT_OVERLAYS) += sdhost-overlay.dtb
4444
dtb-$(RPI_DT_OVERLAYS) += spi-bcm2708-overlay.dtb
4545
dtb-$(RPI_DT_OVERLAYS) += spi-bcm2835-overlay.dtb
46+
dtb-$(RPI_DT_OVERLAYS) += spi-dma-overlay.dtb
4647
dtb-$(RPI_DT_OVERLAYS) += tinylcd35-overlay.dtb
4748
dtb-$(RPI_DT_OVERLAYS) += uart1-overlay.dtb
4849
dtb-$(RPI_DT_OVERLAYS) += vga666-overlay.dtb

arch/arm/boot/dts/overlays/README

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,12 @@ Load: dtoverlay=spi-bcm2835
474474
Params: <None>
475475

476476

477+
Name: spi-dma
478+
Info: enables dma modes for spi-bcm2835
479+
Load: dtoverlay=spi-dma
480+
Params: <None>
481+
482+
477483
Name: tinylcd35
478484
Info: 3.5" Color TFT Display by www.tinylcd.com
479485
Options: Touch, RTC, keypad
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Device tree overlay for spi-bcm2835 to allow dma
3+
*/
4+
5+
/dts-v1/;
6+
/plugin/;
7+
8+
/ {
9+
compatible = "brcm,bcm2835", "brcm,bcm2836", "brcm,bcm2708", "brcm,bcm2709";
10+
11+
fragment@0 {
12+
target = <&spi0>;
13+
__overlay__ {
14+
#address-cells = <1>;
15+
#size-cells = <0>;
16+
dmas = <&dma 6>, <&dma 7>;
17+
dma-names = "tx", "rx";
18+
};
19+
};
20+
};

0 commit comments

Comments
 (0)