Skip to content
Permalink
Browse files

Merge pull request #1522 from DigitalDreamtimeLtd/rpi-4.6.y

Pull upstream dma backport into rpi 4.6.y
  • Loading branch information
popcornmix committed Jun 10, 2016
2 parents 435250d + 5fc5ec2 commit 47b63bd3091121b5f7895d7a2b8f6538a705e097
Showing with 505 additions and 309 deletions.
  1. +24 −2 arch/arm/boot/dts/bcm2708_common.dtsi
  2. +7 −0 arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
  3. +474 −307 drivers/dma/bcm2835-dma.c
@@ -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 {
@@ -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";

0 comments on commit 47b63bd

Please sign in to comment.
You can’t perform that action at this time.