diff options
author | Barry Song <Baohua.Song@csr.com> | 2014-03-27 03:49:31 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2014-03-29 09:50:13 -0400 |
commit | 2e041c94628c2f0b8b704dc092802ddeaa70c6e9 (patch) | |
tree | 5dce0f4735a928382b5e47be8d84c6ffe80b03f8 /arch/arm | |
parent | 80b0e0abfbcf9897ee263a79bc4cbdcfeca72431 (diff) |
dmaengine: sirf: enable generic dt binding for dma channels
move to support of_dma_request_slave_channel() and dma_request_slave_channel.
we add a xlate() to let dma clients be able to find right dma_chan by generic
"dmas" properties in dts.
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/atlas6.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/prima2.dtsi | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi index f8674bcc4489..ec23b5c86fb7 100644 --- a/arch/arm/boot/dts/atlas6.dtsi +++ b/arch/arm/boot/dts/atlas6.dtsi | |||
@@ -269,6 +269,7 @@ | |||
269 | reg = <0xb00b0000 0x10000>; | 269 | reg = <0xb00b0000 0x10000>; |
270 | interrupts = <12>; | 270 | interrupts = <12>; |
271 | clocks = <&clks 24>; | 271 | clocks = <&clks 24>; |
272 | #dma-cells = <1>; | ||
272 | }; | 273 | }; |
273 | 274 | ||
274 | dmac1: dma-controller@b0160000 { | 275 | dmac1: dma-controller@b0160000 { |
@@ -277,6 +278,7 @@ | |||
277 | reg = <0xb0160000 0x10000>; | 278 | reg = <0xb0160000 0x10000>; |
278 | interrupts = <13>; | 279 | interrupts = <13>; |
279 | clocks = <&clks 25>; | 280 | clocks = <&clks 25>; |
281 | #dma-cells = <1>; | ||
280 | }; | 282 | }; |
281 | 283 | ||
282 | vip@b00C0000 { | 284 | vip@b00C0000 { |
diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi index 0e219932d7cc..3a15dee2e8ab 100644 --- a/arch/arm/boot/dts/prima2.dtsi +++ b/arch/arm/boot/dts/prima2.dtsi | |||
@@ -286,6 +286,7 @@ | |||
286 | reg = <0xb00b0000 0x10000>; | 286 | reg = <0xb00b0000 0x10000>; |
287 | interrupts = <12>; | 287 | interrupts = <12>; |
288 | clocks = <&clks 24>; | 288 | clocks = <&clks 24>; |
289 | #dma-cells = <1>; | ||
289 | }; | 290 | }; |
290 | 291 | ||
291 | dmac1: dma-controller@b0160000 { | 292 | dmac1: dma-controller@b0160000 { |
@@ -294,6 +295,7 @@ | |||
294 | reg = <0xb0160000 0x10000>; | 295 | reg = <0xb0160000 0x10000>; |
295 | interrupts = <13>; | 296 | interrupts = <13>; |
296 | clocks = <&clks 25>; | 297 | clocks = <&clks 25>; |
298 | #dma-cells = <1>; | ||
297 | }; | 299 | }; |
298 | 300 | ||
299 | vip@b00C0000 { | 301 | vip@b00C0000 { |