diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 05:13:53 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 05:13:53 +0400 |
| commit | cbfef53360ea88fa7ef9f80def778fba9b05d21e (patch) | |
| tree | 9e23ee08206ec0304e25e8a93eabc2d5bcd8ae9c /Documentation/devicetree/bindings/dma/ti-edma.txt | |
| parent | d35cc56ddfc948d8df1aa6d41ac345fcec01854d (diff) | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
| download | linux-cbfef53360ea88fa7ef9f80def778fba9b05d21e.tar.xz | |
Merge 3.15-rc6 into driver-core-next
We want the kernfs fixes in this branch as well for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/dma/ti-edma.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/dma/ti-edma.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/dma/ti-edma.txt b/Documentation/devicetree/bindings/dma/ti-edma.txt index 9fbbdb783a72..68ff2137bae7 100644 --- a/Documentation/devicetree/bindings/dma/ti-edma.txt +++ b/Documentation/devicetree/bindings/dma/ti-edma.txt @@ -29,6 +29,6 @@ edma: edma@49000000 { dma-channels = <64>; ti,edma-regions = <4>; ti,edma-slots = <256>; - ti,edma-xbar-event-map = <1 12 - 2 13>; + ti,edma-xbar-event-map = /bits/ 16 <1 12 + 2 13>; }; |