Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Thomas Petazzoni and committed by
Gregory CLEMENT
449e1d64 d770e558

+4 -4
+2 -2
arch/arm/boot/dts/armada-38x.dtsi
··· 450 450 }; 451 451 452 452 xor@60800 { 453 - compatible = "marvell,orion-xor"; 453 + compatible = "marvell,armada-380-xor", "marvell,orion-xor"; 454 454 reg = <0x60800 0x100 455 455 0x60a00 0x100>; 456 456 clocks = <&gateclk 22>; ··· 470 470 }; 471 471 472 472 xor@60900 { 473 - compatible = "marvell,orion-xor"; 473 + compatible = "marvell,armada-380-xor", "marvell,orion-xor"; 474 474 reg = <0x60900 0x100 475 475 0x60b00 0x100>; 476 476 clocks = <&gateclk 28>;
+2 -2
arch/arm/boot/dts/armada-39x.dtsi
··· 325 325 }; 326 326 327 327 xor@60800 { 328 - compatible = "marvell,orion-xor"; 328 + compatible = "marvell,armada-380-xor", "marvell,orion-xor"; 329 329 reg = <0x60800 0x100 330 330 0x60a00 0x100>; 331 331 clocks = <&gateclk 22>; ··· 345 345 }; 346 346 347 347 xor@60900 { 348 - compatible = "marvell,orion-xor"; 348 + compatible = "marvell,armada-380-xor", "marvell,orion-xor"; 349 349 reg = <0x60900 0x100 350 350 0x60b00 0x100>; 351 351 clocks = <&gateclk 28>;