[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1431445063-20226-9-git-send-email-maxime.ripard@free-electrons.com>
Date: Tue, 12 May 2015 17:37:43 +0200
From: Maxime Ripard <maxime.ripard@...e-electrons.com>
To: Vinod Koul <vinod.koul@...el.com>,
Dan Williams <dan.j.williams@...el.com>,
Gregory Clement <gregory.clement@...e-electrons.com>,
Jason Cooper <jason@...edaemon.net>,
Andrew Lunn <andrew@...n.ch>,
Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>
Cc: dmaengine@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org, linux-crypto@...r.kernel.org,
Lior Amsalem <alior@...vell.com>,
Thomas Petazzoni <thomas@...e-electrons.com>,
Herbert Xu <herbert@...dor.apana.org.au>,
"David S. Miller" <davem@...emloft.net>
Subject: [PATCH 8/8] ARM: mvebu: a38x: Enable A38x XOR engine features
From: Lior Amsalem <alior@...vell.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 <alior@...vell.com>
Reviewed-by: Ofer Heifetz <oferh@...vell.com>
Reviewed-by: Nadav Haklai <nadavh@...vell.com>
Tested-by: Nadav Haklai <nadavh@...vell.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@...00 {
- 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@...00 {
- 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 majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists