diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-06-17 08:12:21 -0400 |
|---|---|---|
| committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2015-07-09 08:25:28 -0400 |
| commit | 449e1d649c52a80db73dd313dce92d6e191b801b (patch) | |
| tree | 610b43085a2f11a8d0caa10f00fcccd8928e9215 | |
| parent | d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff) | |
ARM: mvebu: use armada-380-xor on Armada 38x and 39x
The Armada 38x and 39x SoC support have an updated XOR hardware block
compared to previous SoCs. These features can be enabled by using the
'armada-380-xor' compatible string, available since commit
6f166312c6ea ("dmaengine: mv_xor: add support for a38x command in
descriptor mode").
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
| -rw-r--r-- | arch/arm/boot/dts/armada-38x.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-39x.dtsi | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 04ecfe6e2bc6..1230bfd01a7e 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi | |||
| @@ -450,7 +450,7 @@ | |||
| 450 | }; | 450 | }; |
| 451 | 451 | ||
| 452 | xor@60800 { | 452 | xor@60800 { |
| 453 | compatible = "marvell,orion-xor"; | 453 | compatible = "marvell,armada-380-xor", "marvell,orion-xor"; |
| 454 | reg = <0x60800 0x100 | 454 | reg = <0x60800 0x100 |
| 455 | 0x60a00 0x100>; | 455 | 0x60a00 0x100>; |
| 456 | clocks = <&gateclk 22>; | 456 | clocks = <&gateclk 22>; |
| @@ -470,7 +470,7 @@ | |||
| 470 | }; | 470 | }; |
| 471 | 471 | ||
| 472 | xor@60900 { | 472 | xor@60900 { |
| 473 | compatible = "marvell,orion-xor"; | 473 | compatible = "marvell,armada-380-xor", "marvell,orion-xor"; |
| 474 | reg = <0x60900 0x100 | 474 | reg = <0x60900 0x100 |
| 475 | 0x60b00 0x100>; | 475 | 0x60b00 0x100>; |
| 476 | clocks = <&gateclk 28>; | 476 | clocks = <&gateclk 28>; |
diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi index fc9864f85fc2..619b79043eee 100644 --- a/arch/arm/boot/dts/armada-39x.dtsi +++ b/arch/arm/boot/dts/armada-39x.dtsi | |||
| @@ -325,7 +325,7 @@ | |||
| 325 | }; | 325 | }; |
| 326 | 326 | ||
| 327 | xor@60800 { | 327 | xor@60800 { |
| 328 | compatible = "marvell,orion-xor"; | 328 | compatible = "marvell,armada-380-xor", "marvell,orion-xor"; |
| 329 | reg = <0x60800 0x100 | 329 | reg = <0x60800 0x100 |
| 330 | 0x60a00 0x100>; | 330 | 0x60a00 0x100>; |
| 331 | clocks = <&gateclk 22>; | 331 | clocks = <&gateclk 22>; |
| @@ -345,7 +345,7 @@ | |||
| 345 | }; | 345 | }; |
| 346 | 346 | ||
| 347 | xor@60900 { | 347 | xor@60900 { |
| 348 | compatible = "marvell,orion-xor"; | 348 | compatible = "marvell,armada-380-xor", "marvell,orion-xor"; |
| 349 | reg = <0x60900 0x100 | 349 | reg = <0x60900 0x100 |
| 350 | 0x60b00 0x100>; | 350 | 0x60b00 0x100>; |
| 351 | clocks = <&gateclk 28>; | 351 | clocks = <&gateclk 28>; |