From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/Documentation/devicetree/bindings/dma/sirfsoc-dma.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kernel/Documentation/devicetree/bindings/dma/sirfsoc-dma.txt') diff --git a/kernel/Documentation/devicetree/bindings/dma/sirfsoc-dma.txt b/kernel/Documentation/devicetree/bindings/dma/sirfsoc-dma.txt index ecbc96ad3..ccd52d6a2 100644 --- a/kernel/Documentation/devicetree/bindings/dma/sirfsoc-dma.txt +++ b/kernel/Documentation/devicetree/bindings/dma/sirfsoc-dma.txt @@ -3,7 +3,8 @@ See dma.txt first Required properties: -- compatible: Should be "sirf,prima2-dmac" or "sirf,marco-dmac" +- compatible: Should be "sirf,prima2-dmac", "sirf,atlas7-dmac" or + "sirf,atlas7-dmac-v2" - reg: Should contain DMA registers location and length. - interrupts: Should contain one interrupt shared by all channel - #dma-cells: must be <1>. used to represent the number of integer -- cgit 1.2.3-korg