diff options
| author | Qipan Li <Qipan.Li@csr.com> | 2014-01-30 00:57:29 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-13 13:36:25 -0500 |
| commit | 9be16b38cf43181efc12ee6f467aaf222ad31b03 (patch) | |
| tree | a2ee5255bc6e3089e7644c91f1fae744e0568f70 /arch/arm/boot/dts/prima2.dtsi | |
| parent | ef2889f7ffee67f0aed49e854c72be63f1466759 (diff) | |
serial: sirf: move to use generic dma dt-binding to get dma channels
instead of using sirf specific dma channel property like "sirf,uart-dma-rx-channel"
and "sirf,uart-dma-tx-channel", here we move to use generic dma dt-binding to get
the channel like:
- sirf,uart-dma-rx-channel = <21>;
- sirf,uart-dma-tx-channel = <2>;
+ dmas = <&dmac1 5>, <&dmac0 2>;
+ dma-names = "rx", "tx";
and we move dma_request_channel() to dma_request_slave_channel(), we don't need to
call sirfsoc dma filter function sirfsoc_dma_filter_id() again.
Signed-off-by: Qipan Li <Qipan.Li@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/prima2.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/prima2.dtsi | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi index 0e219932d7cc..8582ae41a583 100644 --- a/arch/arm/boot/dts/prima2.dtsi +++ b/arch/arm/boot/dts/prima2.dtsi | |||
| @@ -223,8 +223,8 @@ | |||
| 223 | interrupts = <17>; | 223 | interrupts = <17>; |
| 224 | fifosize = <128>; | 224 | fifosize = <128>; |
| 225 | clocks = <&clks 13>; | 225 | clocks = <&clks 13>; |
| 226 | sirf,uart-dma-rx-channel = <21>; | 226 | dmas = <&dmac1 5>, <&dmac0 2>; |
| 227 | sirf,uart-dma-tx-channel = <2>; | 227 | dma-names = "rx", "tx"; |
| 228 | }; | 228 | }; |
| 229 | 229 | ||
| 230 | uart1: uart@b0060000 { | 230 | uart1: uart@b0060000 { |
| @@ -243,8 +243,8 @@ | |||
| 243 | interrupts = <19>; | 243 | interrupts = <19>; |
| 244 | fifosize = <128>; | 244 | fifosize = <128>; |
| 245 | clocks = <&clks 15>; | 245 | clocks = <&clks 15>; |
| 246 | sirf,uart-dma-rx-channel = <6>; | 246 | dmas = <&dmac0 6>, <&dmac0 7>; |
| 247 | sirf,uart-dma-tx-channel = <7>; | 247 | dma-names = "rx", "tx"; |
| 248 | }; | 248 | }; |
| 249 | 249 | ||
| 250 | usp0: usp@b0080000 { | 250 | usp0: usp@b0080000 { |
| @@ -254,8 +254,8 @@ | |||
| 254 | interrupts = <20>; | 254 | interrupts = <20>; |
| 255 | fifosize = <128>; | 255 | fifosize = <128>; |
| 256 | clocks = <&clks 28>; | 256 | clocks = <&clks 28>; |
| 257 | sirf,usp-dma-rx-channel = <17>; | 257 | dmas = <&dmac1 1>, <&dmac1 2>; |
| 258 | sirf,usp-dma-tx-channel = <18>; | 258 | dma-names = "rx", "tx"; |
| 259 | }; | 259 | }; |
| 260 | 260 | ||
| 261 | usp1: usp@b0090000 { | 261 | usp1: usp@b0090000 { |
| @@ -265,8 +265,8 @@ | |||
| 265 | interrupts = <21>; | 265 | interrupts = <21>; |
| 266 | fifosize = <128>; | 266 | fifosize = <128>; |
| 267 | clocks = <&clks 29>; | 267 | clocks = <&clks 29>; |
| 268 | sirf,usp-dma-rx-channel = <14>; | 268 | dmas = <&dmac0 14>, <&dmac0 15>; |
| 269 | sirf,usp-dma-tx-channel = <15>; | 269 | dma-names = "rx", "tx"; |
| 270 | }; | 270 | }; |
| 271 | 271 | ||
| 272 | usp2: usp@b00a0000 { | 272 | usp2: usp@b00a0000 { |
| @@ -276,8 +276,8 @@ | |||
| 276 | interrupts = <22>; | 276 | interrupts = <22>; |
| 277 | fifosize = <128>; | 277 | fifosize = <128>; |
| 278 | clocks = <&clks 30>; | 278 | clocks = <&clks 30>; |
| 279 | sirf,usp-dma-rx-channel = <10>; | 279 | dmas = <&dmac0 10>, <&dmac0 11>; |
| 280 | sirf,usp-dma-tx-channel = <11>; | 280 | dma-names = "rx", "tx"; |
| 281 | }; | 281 | }; |
| 282 | 282 | ||
| 283 | dmac0: dma-controller@b00b0000 { | 283 | dmac0: dma-controller@b00b0000 { |