Skip to content

Pull upstream dma backport into rpi 4.4.y #1524

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

Merged
merged 19 commits into from
Jun 13, 2016
Merged

Pull upstream dma backport into rpi 4.4.y #1524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8325e36
Revert "bcm2835-dma: Fix up convert to DMA pool"
msperl Apr 22, 2016
3cd8f1c
Revert "bcm2835-dma: Limit cyclic transfers on lite channels to 32k"
msperl Apr 22, 2016
825d92c
Revert "dmaengine: bcm2835: Load driver early and support legacy API"
msperl Apr 22, 2016
9a33875
Revert "dmaengine: bcm2835: Add slave dma support"
msperl Apr 22, 2016
2c023f1
dmaengine: bcm2835: remove unnecessary masking of dma channels
msperl Mar 16, 2016
137aa4c
dmaengine: bcm2835: add additional defines for DMA-registers
msperl Mar 16, 2016
4fecd86
dmaengine: bcm2835: move cyclic member from bcm2835_chan into bcm2835…
msperl Mar 16, 2016
5ac4b48
dmaengine: bcm2835: move controlblock chain generation into separate …
msperl Mar 16, 2016
fa76092
dmaengine: bcm2835: limit max length based on channel type
msperl Mar 16, 2016
337a401
dmaengine: bcm2835: add slave_sg support to bcm2835-dma
msperl Mar 16, 2016
b9ff0a9
dmaengine: bcm2835: add dma_memcopy support to bcm2835-dma
msperl Mar 16, 2016
a108657
dmaengine: bcm2835: use platform_get_irq_byname
msperl Apr 11, 2016
d9416f4
dmaengine: bcm2835: Load driver early and support legacy API
notro Oct 3, 2015
1436ae9
ARM: bcm270x: changed bcrm,dma-channel-mask to mask out the used channel
msperl Apr 22, 2016
28a1653
ARM: bcm2835: add interrupt-names and apply correct mapping
msperl Apr 23, 2016
0b7523c
ARM: bcm2835: make dma-channel-0 available for kms setups
msperl Apr 23, 2016
51c0665
dmaengine: bcm2835: Fix cyclic DMA period splitting
HiassofT Jun 7, 2016
d212dcf
dmaengine: bcm2835: Avoid splitting periods into very small chunks
HiassofT Jun 8, 2016
f241592
dmaengine: bcm2835: Fix polling for completion of DMA with interrupts…
anholt Jun 4, 2016
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
26 changes: 24 additions & 2 deletions arch/arm/boot/dts/bcm2708_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,32 @@
<1 24>,
<1 25>,
<1 26>,
<1 27>;
/* dma channel 11-14 share one irq */
<1 27>,
<1 27>,
<1 27>,
<1 27>,
/* unused shared irq for all channels */
<1 28>;
interrupt-names = "dma0",
"dma1",
"dma2",
"dma3",
"dma4",
"dma5",
"dma6",
"dma7",
"dma8",
"dma9",
"dma10",
"dma11",
"dma12",
"dma13",
"dma14",
"dma-shared-all";

#dma-cells = <1>;
brcm,dma-channel-mask = <0x0f35>;
brcm,dma-channel-mask = <0x7f34>;
};

intc: interrupt-controller@7e00b200 {
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@
};
};

fragment@15 {
target-path = "/soc/dma";
__overlay__ {
brcm,dma-channel-mask = <0x7f35>;
};
};

__overrides__ {
cma-256 = <0>,"+0-1-2-3-4";
cma-192 = <0>,"-0+1-2-3-4";
Expand Down
Loading