diff for duplicates of <8760iahvk0.fsf@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index 48a61ff..971f5e0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,7 @@ Gregory > status = "okay"; > }; > + -> + cpm_crypto: crypto@800000 { +> + cpm_crypto: crypto at 800000 { > + compatible = "inside-secure,safexcel-eip197"; > + reg = <0x800000 0x200000>; > + interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_LEVEL_HIGH)>, @@ -46,7 +46,7 @@ Gregory > + }; > }; > -> cpm_pcie0: pcie@f2600000 { +> cpm_pcie0: pcie at f2600000 { > diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi > index c9dfa244ebb6..6110d39087a6 100644 > --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi @@ -56,7 +56,7 @@ Gregory > status = "okay"; > }; > + -> + cps_crypto: crypto@800000 { +> + cps_crypto: crypto at 800000 { > + compatible = "inside-secure,safexcel-eip197"; > + reg = <0x800000 0x200000>; > + interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_LEVEL_HIGH)>, @@ -72,7 +72,7 @@ Gregory > + }; > }; > -> cps_pcie0: pcie@f4600000 { +> cps_pcie0: pcie at f4600000 { > -- > 2.11.0 > diff --git a/a/content_digest b/N1/content_digest index 329cfca..7fed120 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,9 @@ "ref\020170329124432.27457-1-antoine.tenart@free-electrons.com\0" "ref\020170329124432.27457-5-antoine.tenart@free-electrons.com\0" - "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" - "Subject\0Re: [PATCH 4/7] arm64: marvell: dts: add crypto engine description for 7k/8k\0" + "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" + "Subject\0[PATCH 4/7] arm64: marvell: dts: add crypto engine description for 7k/8k\0" "Date\0Wed, 12 Apr 2017 10:36:15 +0200\0" - "To\0Antoine Tenart <antoine.tenart@free-electrons.com>\0" - "Cc\0herbert@gondor.apana.org.au" - davem@davemloft.net - jason@lakedaemon.net - andrew@lunn.ch - sebastian.hesselbarth@gmail.com - linux-crypto@vger.kernel.org - linux-arm-kernel@lists.infradead.org - thomas.petazzoni@free-electrons.com - boris.brezillon@free-electrons.com - oferh@marvell.com - igall@marvell.com - " nadavh@marvell.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Antoine,\n" @@ -50,7 +38,7 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tcpm_crypto: crypto@800000 {\n" + "> +\t\t\tcpm_crypto: crypto at 800000 {\n" "> +\t\t\t\tcompatible = \"inside-secure,safexcel-eip197\";\n" "> +\t\t\t\treg = <0x800000 0x200000>;\n" "> +\t\t\t\tinterrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_LEVEL_HIGH)>,\n" @@ -66,7 +54,7 @@ "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tcpm_pcie0: pcie@f2600000 {\n" + "> \t\tcpm_pcie0: pcie at f2600000 {\n" "> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi\n" "> index c9dfa244ebb6..6110d39087a6 100644\n" "> --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi\n" @@ -76,7 +64,7 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tcps_crypto: crypto@800000 {\n" + "> +\t\t\tcps_crypto: crypto at 800000 {\n" "> +\t\t\t\tcompatible = \"inside-secure,safexcel-eip197\";\n" "> +\t\t\t\treg = <0x800000 0x200000>;\n" "> +\t\t\t\tinterrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_LEVEL_HIGH)>,\n" @@ -92,7 +80,7 @@ "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tcps_pcie0: pcie@f4600000 {\n" + "> \t\tcps_pcie0: pcie at f4600000 {\n" "> -- \n" "> 2.11.0\n" ">\n" @@ -103,4 +91,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -df7bc3c199e30ab9017f66dc4cb98a81ee5860cb08bf90b1b9020635a7eb0050 +f25df43c6b86c24df86e4b8cfe9fae1b33e352103759a5d8ec876ff8192ee7c9
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.