diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-11 01:06:07 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-11 01:06:07 -0400 |
| commit | 3b27dcec920075b6f1f5f8014e32e764fcbb96f8 (patch) | |
| tree | 23f41a73480275c5c5222f24de59a2f07c5df73a /Documentation | |
| parent | 6a7c7b007a773a846090f2577de32e7b3a3f42ab (diff) | |
| parent | cf7eb979116c2568e8bc3b6a7269c7a359864ace (diff) | |
Merge tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes
Pull "DaVinci fixes for v3.15" from Sekhar Nori:
The patch fixes EDMA crossbar mapping to actually
make it work. The patch has been tagged for stable.
* tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: common: edma: Fix xbar mapping
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
| -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 { | |||
| 29 | dma-channels = <64>; | 29 | dma-channels = <64>; |
| 30 | ti,edma-regions = <4>; | 30 | ti,edma-regions = <4>; |
| 31 | ti,edma-slots = <256>; | 31 | ti,edma-slots = <256>; |
| 32 | ti,edma-xbar-event-map = <1 12 | 32 | ti,edma-xbar-event-map = /bits/ 16 <1 12 |
| 33 | 2 13>; | 33 | 2 13>; |
| 34 | }; | 34 | }; |