From: Lior Amsalem <al...@marvell.com>
The new XOR engine has a new compatible of its own, together with new
channel capabilities.
Use that new compatible now that we have a driver that can handle it.
Signed-off-by: Lior Amsalem <al...@marvell.com>
Reviewed-by: Ofer Heifetz <of...@marvell.com>
Reviewed-by: Nadav Haklai <nad...@marvell.com>
Tested-by: Nadav Haklai <nad...@marvell.com>
---
arch/arm/boot/dts/armada-38x.dtsi | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boot/dts/armada-38x.dtsi
b/arch/arm/boot/dts/armada-38x.dtsi
index ed2dd8ba4080..6d07b7389415 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -448,7 +448,7 @@
};
xor@60800 {
- compatible = "marvell,orion-xor";
+ compatible = "marvell,a38x-xor";
reg = <0x60800 0x100
0x60a00 0x100>;
clocks = <&gateclk 22>;
@@ -458,17 +458,13 @@
interrupts = <GIC_SPI 22
IRQ_TYPE_LEVEL_HIGH>;
dmacap,memcpy;
dmacap,xor;
- };
- xor01 {
- interrupts = <GIC_SPI 23
IRQ_TYPE_LEVEL_HIGH>;
- dmacap,memcpy;
- dmacap,xor;
- dmacap,memset;
+ dmacap,pq;
+ dmacap,interrupt;
};
};
xor@60900 {
- compatible = "marvell,orion-xor";
+ compatible = "marvell,a38x-xor";
reg = <0x60900 0x100
0x60b00 0x100>;
clocks = <&gateclk 28>;
@@ -478,12 +474,8 @@
interrupts = <GIC_SPI 65
IRQ_TYPE_LEVEL_HIGH>;
dmacap,memcpy;
dmacap,xor;
- };
- xor11 {
- interrupts = <GIC_SPI 66
IRQ_TYPE_LEVEL_HIGH>;
- dmacap,memcpy;
- dmacap,xor;
- dmacap,memset;
+ dmacap,pq;
+ dmacap,interrupt;
};
};
--
2.4.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
