diff options
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/atlas6.dtsi | 17 | ||||
| -rw-r--r-- | arch/arm/boot/dts/prima2.dtsi | 20 |
2 files changed, 19 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi index f8674bcc4489..0c81dc945aed 100644 --- a/arch/arm/boot/dts/atlas6.dtsi +++ b/arch/arm/boot/dts/atlas6.dtsi | |||
| @@ -217,8 +217,8 @@ | |||
| 217 | interrupts = <17>; | 217 | interrupts = <17>; |
| 218 | fifosize = <128>; | 218 | fifosize = <128>; |
| 219 | clocks = <&clks 13>; | 219 | clocks = <&clks 13>; |
| 220 | sirf,uart-dma-rx-channel = <21>; | 220 | dmas = <&dmac1 5>, <&dmac0 2>; |
| 221 | sirf,uart-dma-tx-channel = <2>; | 221 | dma-names = "rx", "tx"; |
| 222 | }; | 222 | }; |
| 223 | 223 | ||
| 224 | uart1: uart@b0060000 { | 224 | uart1: uart@b0060000 { |
| @@ -228,6 +228,7 @@ | |||
| 228 | interrupts = <18>; | 228 | interrupts = <18>; |
| 229 | fifosize = <32>; | 229 | fifosize = <32>; |
| 230 | clocks = <&clks 14>; | 230 | clocks = <&clks 14>; |
| 231 | dma-names = "no-rx", "no-tx"; | ||
| 231 | }; | 232 | }; |
| 232 | 233 | ||
| 233 | uart2: uart@b0070000 { | 234 | uart2: uart@b0070000 { |
| @@ -237,8 +238,8 @@ | |||
| 237 | interrupts = <19>; | 238 | interrupts = <19>; |
| 238 | fifosize = <128>; | 239 | fifosize = <128>; |
| 239 | clocks = <&clks 15>; | 240 | clocks = <&clks 15>; |
| 240 | sirf,uart-dma-rx-channel = <6>; | 241 | dmas = <&dmac0 6>, <&dmac0 7>; |
| 241 | sirf,uart-dma-tx-channel = <7>; | 242 | dma-names = "rx", "tx"; |
| 242 | }; | 243 | }; |
| 243 | 244 | ||
| 244 | usp0: usp@b0080000 { | 245 | usp0: usp@b0080000 { |
| @@ -248,8 +249,8 @@ | |||
| 248 | interrupts = <20>; | 249 | interrupts = <20>; |
| 249 | fifosize = <128>; | 250 | fifosize = <128>; |
| 250 | clocks = <&clks 28>; | 251 | clocks = <&clks 28>; |
| 251 | sirf,usp-dma-rx-channel = <17>; | 252 | dmas = <&dmac1 1>, <&dmac1 2>; |
| 252 | sirf,usp-dma-tx-channel = <18>; | 253 | dma-names = "rx", "tx"; |
| 253 | }; | 254 | }; |
| 254 | 255 | ||
| 255 | usp1: usp@b0090000 { | 256 | usp1: usp@b0090000 { |
| @@ -259,8 +260,8 @@ | |||
| 259 | interrupts = <21>; | 260 | interrupts = <21>; |
| 260 | fifosize = <128>; | 261 | fifosize = <128>; |
| 261 | clocks = <&clks 29>; | 262 | clocks = <&clks 29>; |
| 262 | sirf,usp-dma-rx-channel = <14>; | 263 | dmas = <&dmac0 14>, <&dmac0 15>; |
| 263 | sirf,usp-dma-tx-channel = <15>; | 264 | dma-names = "rx", "tx"; |
| 264 | }; | 265 | }; |
| 265 | 266 | ||
| 266 | dmac0: dma-controller@b00b0000 { | 267 | dmac0: dma-controller@b00b0000 { |
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 { |