diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-12-10 08:43:43 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-12-10 08:43:43 +0530 |
| commit | bcb4b619116569d071b26c6f33506459a560ab6a (patch) | |
| tree | f1f5cbba5077d7fcc46521163ad547de1f6c0237 /Documentation | |
| parent | e958e079e254b27bde6185f5b9af5b40986cc60e (diff) | |
| parent | ae0add740cd06169cd124f9aaa6eceb11e5b3060 (diff) | |
| download | linux-bcb4b619116569d071b26c6f33506459a560ab6a.tar.bz2 | |
Merge branch 'fix/edma' into fixes
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/dma/ti-edma.txt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/dma/ti-edma.txt b/Documentation/devicetree/bindings/dma/ti-edma.txt index d3d0a4fb1c73..079b42a81d7c 100644 --- a/Documentation/devicetree/bindings/dma/ti-edma.txt +++ b/Documentation/devicetree/bindings/dma/ti-edma.txt @@ -22,8 +22,7 @@ Required properties: Optional properties: - ti,hwmods: Name of the hwmods associated to the eDMA CC - ti,edma-memcpy-channels: List of channels allocated to be used for memcpy, iow - these channels will be SW triggered channels. The list must - contain 16 bits numbers, see example. + these channels will be SW triggered channels. See example. - ti,edma-reserved-slot-ranges: PaRAM slot ranges which should not be used by the driver, they are allocated to be used by for example the DSP. See example. @@ -56,10 +55,9 @@ edma: edma@49000000 { ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 7>, <&edma_tptc2 0>; /* Channel 20 and 21 is allocated for memcpy */ - ti,edma-memcpy-channels = /bits/ 16 <20 21>; - /* The following PaRAM slots are reserved: 35-45 and 100-110 */ - ti,edma-reserved-slot-ranges = /bits/ 16 <35 10>, - /bits/ 16 <100 10>; + ti,edma-memcpy-channels = <20 21>; + /* The following PaRAM slots are reserved: 35-44 and 100-109 */ + ti,edma-reserved-slot-ranges = <35 10>, <100 10>; }; edma_tptc0: tptc@49800000 { |