Merge tag 'mvebu-dt64-4.19-2' of git://git.infradead.org/linux-mvebu into next/dt

mvebu dt64 for 4.19 (part 2)

Use more specific compatible for the Inside Secure SafeXcel on the
Armada 37xx and the Armada 7K/8K SoCs.

* tag 'mvebu-dt64-4.19-2' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: armada-37xx: update the crypto engine compatible
  arm64: dts: marvell: armada-cp110: update the crypto engine compatible

Signed-off-by: Olof Johansson <[email protected]>

diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index fc5623ac14b16f578b9a41711b8c522d7b3c120a..d9531e242eb4c859545dad19d4bbb6c12e1c3a66 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -308,7 +308,7 @@
                        };
 
                        crypto: crypto@90000 {
-                               compatible = "inside-secure,safexcel-eip97";
+                               compatible = "inside-secure,safexcel-eip97ies";
                                reg = <0x90000 0x20000>;
                                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
                                             <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
index 1c6ff8197a88b1f890fed5b592b9358986942145..840c8454d03e3e81770a718e8e6aa17f53298ec6 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
@@ -398,7 +398,7 @@
                };
 
                CP110_LABEL(crypto): crypto@800000 {
-                       compatible = "inside-secure,safexcel-eip197";
+                       compatible = "inside-secure,safexcel-eip197b";
                        reg = <0x800000 0x200000>;
                        interrupts = <ICU_GRP_NSR 87 IRQ_TYPE_LEVEL_HIGH>,
                                <ICU_GRP_NSR 88 IRQ_TYPE_LEVEL_HIGH>,