diff for duplicates of <87tw3a3dy4.fsf@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index 54e5c9b..f6dc491 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,12 +1,12 @@ Hi Thomas, - On mar., juin 20 2017, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: + On mar., juin 20 2017, Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> wrote: > This commit modifies the Marvell EBU Armada 7K and 8K Device Tree files > to describe the ICU and GICP units, and use ICU interrupts for all > devices in the CP110 blocks. > -> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +> Signed-off-by: Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> I've just tried to apply your patch as the series seems about to be merged. After the resolution of a few merge conflict it was applied. @@ -27,14 +27,14 @@ But I still have a problem see below: > marvell,spi-base = <128>, <136>, <144>, <152>; > }; > -> + gicp: gicp at 3f0040 { +> + gicp: gicp@3f0040 { > + compatible = "marvell,ap806-gicp"; > + reg = <0x3f0040 0x10>; > + marvell,spi-ranges = <64 64>, <288 64>; > + msi-controller; > + }; > + -> pic: interrupt-controller at 3f0100 { +> pic: interrupt-controller@3f0100 { > compatible = "marvell,armada-8k-pic"; > reg = <0x3f0100 0x10>; > diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi @@ -66,14 +66,14 @@ Gregory > + interrupt-parent = <&cpm_icu>; > ranges; > -> config-space at f2000000 { +> config-space@f2000000 { > #address-cells = <1>; > #size-cells = <1>; > compatible = "simple-bus"; > - interrupt-parent = <&gic>; > ranges = <0x0 0x0 0xf2000000 0x2000000>; > -> cpm_ethernet: ethernet at 0 { +> cpm_ethernet: ethernet@0 { > @@ -68,21 +69,21 @@ > dma-coherent; > @@ -103,7 +103,7 @@ Gregory > reg = <0x12a200 0x10>; > }; > -> + cpm_icu: interrupt-controller at 1e0000 { +> + cpm_icu: interrupt-controller@1e0000 { > + compatible = "marvell,cp110-icu"; > + reg = <0x1e0000 0x10>; > + #interrupt-cells = <3>; @@ -111,7 +111,7 @@ Gregory > + msi-parent = <&gicp>; > + }; > + -> cpm_syscon0: system-controller at 440000 { +> cpm_syscon0: system-controller@440000 { > compatible = "marvell,cp110-system-controller0", > "syscon"; > @@ -120,14 +129,14 @@ @@ -122,7 +122,7 @@ Gregory > + interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>; > }; > -> cpm_sata0: sata at 540000 { +> cpm_sata0: sata@540000 { > compatible = "marvell,armada-8k-ahci", > "generic-ahci"; > reg = <0x540000 0x30000>; @@ -168,7 +168,7 @@ Gregory > status = "disabled"; > }; > @@ -213,7 +222,7 @@ -> cpm_trng: trng at 760000 { +> cpm_trng: trng@760000 { > compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76"; > reg = <0x760000 0x7d>; > - interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>; @@ -177,7 +177,7 @@ Gregory > status = "okay"; > }; > @@ -221,7 +230,7 @@ -> cpm_sdhci0: sdhci at 780000 { +> cpm_sdhci0: sdhci@780000 { > compatible = "marvell,armada-cp110-sdhci"; > reg = <0x780000 0x300>; > - interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; @@ -186,7 +186,7 @@ Gregory > clocks = <&cpm_syscon0 1 4>; > dma-coherent; > @@ -231,13 +240,13 @@ -> cpm_crypto: crypto at 800000 { +> cpm_crypto: crypto@800000 { > compatible = "inside-secure,safexcel-eip197"; > reg = <0x800000 0x200000>; > - interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING @@ -250,14 +250,14 @@ Gregory > + interrupt-parent = <&cps_icu>; > ranges; > -> config-space at f4000000 { +> config-space@f4000000 { > #address-cells = <1>; > #size-cells = <1>; > compatible = "simple-bus"; > - interrupt-parent = <&gic>; > ranges = <0x0 0x0 0xf4000000 0x2000000>; > -> cps_rtc: rtc at 284000 { +> cps_rtc: rtc@284000 { > @@ -75,21 +74,21 @@ > dma-coherent; > @@ -287,7 +287,7 @@ Gregory > reg = <0x12a200 0x10>; > }; > -> + cps_icu: interrupt-controller at 1e0000 { +> + cps_icu: interrupt-controller@1e0000 { > + compatible = "marvell,cp110-icu"; > + reg = <0x1e0000 0x10>; > + #interrupt-cells = <3>; @@ -295,7 +295,7 @@ Gregory > + msi-parent = <&gicp>; > + }; > + -> cps_syscon0: system-controller at 440000 { +> cps_syscon0: system-controller@440000 { > compatible = "marvell,cp110-system-controller0", > "syscon"; > @@ -127,7 +134,7 @@ @@ -344,7 +344,7 @@ Gregory > status = "disabled"; > }; > @@ -213,7 +220,7 @@ -> cps_trng: trng at 760000 { +> cps_trng: trng@760000 { > compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76"; > reg = <0x760000 0x7d>; > - interrupts = <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>; @@ -353,7 +353,7 @@ Gregory > status = "okay"; > }; > @@ -221,13 +228,13 @@ -> cps_crypto: crypto at 800000 { +> cps_crypto: crypto@800000 { > compatible = "inside-secure,safexcel-eip197"; > reg = <0x800000 0x200000>; > - interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING @@ -414,3 +414,7 @@ Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index c2701be..ad7f120 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,39 @@ "ref\020170620140722.31646-1-thomas.petazzoni@free-electrons.com\0" "ref\020170620140722.31646-7-thomas.petazzoni@free-electrons.com\0" - "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" - "Subject\0[PATCH v4 6/6] arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K\0" + "ref\020170620140722.31646-7-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" + "From\0Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Subject\0Re: [PATCH v4 6/6] arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K\0" "Date\0Tue, 20 Jun 2017 16:56:35 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Cc\0Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>" + Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> + Marc Zyngier <marc.zyngier-5wv7dgnIgG8@public.gmane.org> + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> + Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> + Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + Nadav Haklai <nadavh-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> + Hanna Hawa <hannah-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> + Yehuda Yitschak <yehuday-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> + Antoine Tenart <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + " Miqu\303\250l Raynal <miquel.raynal-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" "\00:1\0" "b\0" "Hi Thomas,\n" " \n" - " On mar., juin 20 2017, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:\n" + " On mar., juin 20 2017, Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> wrote:\n" "\n" "> This commit modifies the Marvell EBU Armada 7K and 8K Device Tree files\n" "> to describe the ICU and GICP units, and use ICU interrupts for all\n" "> devices in the CP110 blocks.\n" ">\n" - "> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>\n" + "> Signed-off-by: Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "\n" "I've just tried to apply your patch as the series seems about to be\n" "merged. After the resolution of a few merge conflict it was applied.\n" @@ -35,14 +54,14 @@ "> \t\t\t\tmarvell,spi-base = <128>, <136>, <144>, <152>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tgicp: gicp at 3f0040 {\n" + "> +\t\t\tgicp: gicp@3f0040 {\n" "> +\t\t\t\tcompatible = \"marvell,ap806-gicp\";\n" "> +\t\t\t\treg = <0x3f0040 0x10>;\n" "> +\t\t\t\tmarvell,spi-ranges = <64 64>, <288 64>;\n" "> +\t\t\t\tmsi-controller;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tpic: interrupt-controller at 3f0100 {\n" + "> \t\t\tpic: interrupt-controller@3f0100 {\n" "> \t\t\t\tcompatible = \"marvell,armada-8k-pic\";\n" "> \t\t\t\treg = <0x3f0100 0x10>;\n" "> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi\n" @@ -74,14 +93,14 @@ "> +\t\tinterrupt-parent = <&cpm_icu>;\n" "> \t\tranges;\n" "> \n" - "> \t\tconfig-space at f2000000 {\n" + "> \t\tconfig-space@f2000000 {\n" "> \t\t\t#address-cells = <1>;\n" "> \t\t\t#size-cells = <1>;\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> -\t\t\tinterrupt-parent = <&gic>;\n" "> \t\t\tranges = <0x0 0x0 0xf2000000 0x2000000>;\n" "> \n" - "> \t\t\tcpm_ethernet: ethernet at 0 {\n" + "> \t\t\tcpm_ethernet: ethernet@0 {\n" "> @@ -68,21 +69,21 @@\n" "> \t\t\t\tdma-coherent;\n" "> \n" @@ -111,7 +130,7 @@ "> \t\t\t\treg = <0x12a200 0x10>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tcpm_icu: interrupt-controller at 1e0000 {\n" + "> +\t\t\tcpm_icu: interrupt-controller@1e0000 {\n" "> +\t\t\t\tcompatible = \"marvell,cp110-icu\";\n" "> +\t\t\t\treg = <0x1e0000 0x10>;\n" "> +\t\t\t\t#interrupt-cells = <3>;\n" @@ -119,7 +138,7 @@ "> +\t\t\t\tmsi-parent = <&gicp>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tcpm_syscon0: system-controller at 440000 {\n" + "> \t\t\tcpm_syscon0: system-controller@440000 {\n" "> \t\t\t\tcompatible = \"marvell,cp110-system-controller0\",\n" "> \t\t\t\t\t \"syscon\";\n" "> @@ -120,14 +129,14 @@\n" @@ -130,7 +149,7 @@ "> +\t\t\t\tinterrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\tcpm_sata0: sata at 540000 {\n" + "> \t\t\tcpm_sata0: sata@540000 {\n" "> \t\t\t\tcompatible = \"marvell,armada-8k-ahci\",\n" "> \t\t\t\t\t \"generic-ahci\";\n" "> \t\t\t\treg = <0x540000 0x30000>;\n" @@ -176,7 +195,7 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> @@ -213,7 +222,7 @@\n" - "> \t\t\tcpm_trng: trng at 760000 {\n" + "> \t\t\tcpm_trng: trng@760000 {\n" "> \t\t\t\tcompatible = \"marvell,armada-8k-rng\", \"inside-secure,safexcel-eip76\";\n" "> \t\t\t\treg = <0x760000 0x7d>;\n" "> -\t\t\t\tinterrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -185,7 +204,7 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> @@ -221,7 +230,7 @@\n" - "> \t\t\tcpm_sdhci0: sdhci at 780000 {\n" + "> \t\t\tcpm_sdhci0: sdhci@780000 {\n" "> \t\t\t\tcompatible = \"marvell,armada-cp110-sdhci\";\n" "> \t\t\t\treg = <0x780000 0x300>;\n" "> -\t\t\t\tinterrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -194,7 +213,7 @@ "> \t\t\t\tclocks = <&cpm_syscon0 1 4>;\n" "> \t\t\t\tdma-coherent;\n" "> @@ -231,13 +240,13 @@\n" - "> \t\t\tcpm_crypto: crypto at 800000 {\n" + "> \t\t\tcpm_crypto: crypto@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\n" @@ -258,14 +277,14 @@ "> +\t\tinterrupt-parent = <&cps_icu>;\n" "> \t\tranges;\n" "> \n" - "> \t\tconfig-space at f4000000 {\n" + "> \t\tconfig-space@f4000000 {\n" "> \t\t\t#address-cells = <1>;\n" "> \t\t\t#size-cells = <1>;\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> -\t\t\tinterrupt-parent = <&gic>;\n" "> \t\t\tranges = <0x0 0x0 0xf4000000 0x2000000>;\n" "> \n" - "> \t\t\tcps_rtc: rtc at 284000 {\n" + "> \t\t\tcps_rtc: rtc@284000 {\n" "> @@ -75,21 +74,21 @@\n" "> \t\t\t\tdma-coherent;\n" "> \n" @@ -295,7 +314,7 @@ "> \t\t\t\treg = <0x12a200 0x10>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tcps_icu: interrupt-controller at 1e0000 {\n" + "> +\t\t\tcps_icu: interrupt-controller@1e0000 {\n" "> +\t\t\t\tcompatible = \"marvell,cp110-icu\";\n" "> +\t\t\t\treg = <0x1e0000 0x10>;\n" "> +\t\t\t\t#interrupt-cells = <3>;\n" @@ -303,7 +322,7 @@ "> +\t\t\t\tmsi-parent = <&gicp>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tcps_syscon0: system-controller at 440000 {\n" + "> \t\t\tcps_syscon0: system-controller@440000 {\n" "> \t\t\t\tcompatible = \"marvell,cp110-system-controller0\",\n" "> \t\t\t\t\t \"syscon\";\n" "> @@ -127,7 +134,7 @@\n" @@ -352,7 +371,7 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> @@ -213,7 +220,7 @@\n" - "> \t\t\tcps_trng: trng at 760000 {\n" + "> \t\t\tcps_trng: trng@760000 {\n" "> \t\t\t\tcompatible = \"marvell,armada-8k-rng\", \"inside-secure,safexcel-eip76\";\n" "> \t\t\t\treg = <0x760000 0x7d>;\n" "> -\t\t\t\tinterrupts = <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -361,7 +380,7 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> @@ -221,13 +228,13 @@\n" - "> \t\t\tcps_crypto: crypto at 800000 {\n" + "> \t\t\tcps_crypto: crypto@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\n" @@ -421,6 +440,10 @@ "Gregory Clement, Free Electrons\n" "Kernel, drivers, real-time and embedded Linux\n" "development, consulting, training and support.\n" - http://free-electrons.com + "http://free-electrons.com\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -4b1efcaf52193548ed88d5e600775e02f30a61968c3453af0d54e68e27f19019 +5614292a4d5fcb6ae088be99e70e7d0c52961d46c966f609817da47e84c6bb0c
diff --git a/a/1.txt b/N2/1.txt index 54e5c9b..1adf29e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -27,14 +27,14 @@ But I still have a problem see below: > marvell,spi-base = <128>, <136>, <144>, <152>; > }; > -> + gicp: gicp at 3f0040 { +> + gicp: gicp@3f0040 { > + compatible = "marvell,ap806-gicp"; > + reg = <0x3f0040 0x10>; > + marvell,spi-ranges = <64 64>, <288 64>; > + msi-controller; > + }; > + -> pic: interrupt-controller at 3f0100 { +> pic: interrupt-controller@3f0100 { > compatible = "marvell,armada-8k-pic"; > reg = <0x3f0100 0x10>; > diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi @@ -66,14 +66,14 @@ Gregory > + interrupt-parent = <&cpm_icu>; > ranges; > -> config-space at f2000000 { +> config-space@f2000000 { > #address-cells = <1>; > #size-cells = <1>; > compatible = "simple-bus"; > - interrupt-parent = <&gic>; > ranges = <0x0 0x0 0xf2000000 0x2000000>; > -> cpm_ethernet: ethernet at 0 { +> cpm_ethernet: ethernet@0 { > @@ -68,21 +69,21 @@ > dma-coherent; > @@ -103,7 +103,7 @@ Gregory > reg = <0x12a200 0x10>; > }; > -> + cpm_icu: interrupt-controller at 1e0000 { +> + cpm_icu: interrupt-controller@1e0000 { > + compatible = "marvell,cp110-icu"; > + reg = <0x1e0000 0x10>; > + #interrupt-cells = <3>; @@ -111,7 +111,7 @@ Gregory > + msi-parent = <&gicp>; > + }; > + -> cpm_syscon0: system-controller at 440000 { +> cpm_syscon0: system-controller@440000 { > compatible = "marvell,cp110-system-controller0", > "syscon"; > @@ -120,14 +129,14 @@ @@ -122,7 +122,7 @@ Gregory > + interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>; > }; > -> cpm_sata0: sata at 540000 { +> cpm_sata0: sata@540000 { > compatible = "marvell,armada-8k-ahci", > "generic-ahci"; > reg = <0x540000 0x30000>; @@ -168,7 +168,7 @@ Gregory > status = "disabled"; > }; > @@ -213,7 +222,7 @@ -> cpm_trng: trng at 760000 { +> cpm_trng: trng@760000 { > compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76"; > reg = <0x760000 0x7d>; > - interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>; @@ -177,7 +177,7 @@ Gregory > status = "okay"; > }; > @@ -221,7 +230,7 @@ -> cpm_sdhci0: sdhci at 780000 { +> cpm_sdhci0: sdhci@780000 { > compatible = "marvell,armada-cp110-sdhci"; > reg = <0x780000 0x300>; > - interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; @@ -186,7 +186,7 @@ Gregory > clocks = <&cpm_syscon0 1 4>; > dma-coherent; > @@ -231,13 +240,13 @@ -> cpm_crypto: crypto at 800000 { +> cpm_crypto: crypto@800000 { > compatible = "inside-secure,safexcel-eip197"; > reg = <0x800000 0x200000>; > - interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING @@ -250,14 +250,14 @@ Gregory > + interrupt-parent = <&cps_icu>; > ranges; > -> config-space at f4000000 { +> config-space@f4000000 { > #address-cells = <1>; > #size-cells = <1>; > compatible = "simple-bus"; > - interrupt-parent = <&gic>; > ranges = <0x0 0x0 0xf4000000 0x2000000>; > -> cps_rtc: rtc at 284000 { +> cps_rtc: rtc@284000 { > @@ -75,21 +74,21 @@ > dma-coherent; > @@ -287,7 +287,7 @@ Gregory > reg = <0x12a200 0x10>; > }; > -> + cps_icu: interrupt-controller at 1e0000 { +> + cps_icu: interrupt-controller@1e0000 { > + compatible = "marvell,cp110-icu"; > + reg = <0x1e0000 0x10>; > + #interrupt-cells = <3>; @@ -295,7 +295,7 @@ Gregory > + msi-parent = <&gicp>; > + }; > + -> cps_syscon0: system-controller at 440000 { +> cps_syscon0: system-controller@440000 { > compatible = "marvell,cp110-system-controller0", > "syscon"; > @@ -127,7 +134,7 @@ @@ -344,7 +344,7 @@ Gregory > status = "disabled"; > }; > @@ -213,7 +220,7 @@ -> cps_trng: trng at 760000 { +> cps_trng: trng@760000 { > compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76"; > reg = <0x760000 0x7d>; > - interrupts = <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>; @@ -353,7 +353,7 @@ Gregory > status = "okay"; > }; > @@ -221,13 +228,13 @@ -> cps_crypto: crypto at 800000 { +> cps_crypto: crypto@800000 { > compatible = "inside-secure,safexcel-eip197"; > reg = <0x800000 0x200000>; > - interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING diff --git a/a/content_digest b/N2/content_digest index c2701be..fd2e625 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,27 @@ "ref\020170620140722.31646-1-thomas.petazzoni@free-electrons.com\0" "ref\020170620140722.31646-7-thomas.petazzoni@free-electrons.com\0" - "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" - "Subject\0[PATCH v4 6/6] arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K\0" + "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" + "Subject\0Re: [PATCH v4 6/6] arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K\0" "Date\0Tue, 20 Jun 2017 16:56:35 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Thomas Petazzoni <thomas.petazzoni@free-electrons.com>\0" + "Cc\0Thomas Gleixner <tglx@linutronix.de>" + Jason Cooper <jason@lakedaemon.net> + Marc Zyngier <marc.zyngier@arm.com> + linux-kernel@vger.kernel.org + devicetree@vger.kernel.org + Rob Herring <robh+dt@kernel.org> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Kumar Gala <galak@codeaurora.org> + Andrew Lunn <andrew@lunn.ch> + Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> + linux-arm-kernel@lists.infradead.org + Nadav Haklai <nadavh@marvell.com> + Hanna Hawa <hannah@marvell.com> + Yehuda Yitschak <yehuday@marvell.com> + Antoine Tenart <antoine.tenart@free-electrons.com> + " Miqu\303\250l Raynal <miquel.raynal@free-electrons.com>\0" "\00:1\0" "b\0" "Hi Thomas,\n" @@ -35,14 +53,14 @@ "> \t\t\t\tmarvell,spi-base = <128>, <136>, <144>, <152>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tgicp: gicp at 3f0040 {\n" + "> +\t\t\tgicp: gicp@3f0040 {\n" "> +\t\t\t\tcompatible = \"marvell,ap806-gicp\";\n" "> +\t\t\t\treg = <0x3f0040 0x10>;\n" "> +\t\t\t\tmarvell,spi-ranges = <64 64>, <288 64>;\n" "> +\t\t\t\tmsi-controller;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tpic: interrupt-controller at 3f0100 {\n" + "> \t\t\tpic: interrupt-controller@3f0100 {\n" "> \t\t\t\tcompatible = \"marvell,armada-8k-pic\";\n" "> \t\t\t\treg = <0x3f0100 0x10>;\n" "> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi\n" @@ -74,14 +92,14 @@ "> +\t\tinterrupt-parent = <&cpm_icu>;\n" "> \t\tranges;\n" "> \n" - "> \t\tconfig-space at f2000000 {\n" + "> \t\tconfig-space@f2000000 {\n" "> \t\t\t#address-cells = <1>;\n" "> \t\t\t#size-cells = <1>;\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> -\t\t\tinterrupt-parent = <&gic>;\n" "> \t\t\tranges = <0x0 0x0 0xf2000000 0x2000000>;\n" "> \n" - "> \t\t\tcpm_ethernet: ethernet at 0 {\n" + "> \t\t\tcpm_ethernet: ethernet@0 {\n" "> @@ -68,21 +69,21 @@\n" "> \t\t\t\tdma-coherent;\n" "> \n" @@ -111,7 +129,7 @@ "> \t\t\t\treg = <0x12a200 0x10>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tcpm_icu: interrupt-controller at 1e0000 {\n" + "> +\t\t\tcpm_icu: interrupt-controller@1e0000 {\n" "> +\t\t\t\tcompatible = \"marvell,cp110-icu\";\n" "> +\t\t\t\treg = <0x1e0000 0x10>;\n" "> +\t\t\t\t#interrupt-cells = <3>;\n" @@ -119,7 +137,7 @@ "> +\t\t\t\tmsi-parent = <&gicp>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tcpm_syscon0: system-controller at 440000 {\n" + "> \t\t\tcpm_syscon0: system-controller@440000 {\n" "> \t\t\t\tcompatible = \"marvell,cp110-system-controller0\",\n" "> \t\t\t\t\t \"syscon\";\n" "> @@ -120,14 +129,14 @@\n" @@ -130,7 +148,7 @@ "> +\t\t\t\tinterrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\tcpm_sata0: sata at 540000 {\n" + "> \t\t\tcpm_sata0: sata@540000 {\n" "> \t\t\t\tcompatible = \"marvell,armada-8k-ahci\",\n" "> \t\t\t\t\t \"generic-ahci\";\n" "> \t\t\t\treg = <0x540000 0x30000>;\n" @@ -176,7 +194,7 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> @@ -213,7 +222,7 @@\n" - "> \t\t\tcpm_trng: trng at 760000 {\n" + "> \t\t\tcpm_trng: trng@760000 {\n" "> \t\t\t\tcompatible = \"marvell,armada-8k-rng\", \"inside-secure,safexcel-eip76\";\n" "> \t\t\t\treg = <0x760000 0x7d>;\n" "> -\t\t\t\tinterrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -185,7 +203,7 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> @@ -221,7 +230,7 @@\n" - "> \t\t\tcpm_sdhci0: sdhci at 780000 {\n" + "> \t\t\tcpm_sdhci0: sdhci@780000 {\n" "> \t\t\t\tcompatible = \"marvell,armada-cp110-sdhci\";\n" "> \t\t\t\treg = <0x780000 0x300>;\n" "> -\t\t\t\tinterrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -194,7 +212,7 @@ "> \t\t\t\tclocks = <&cpm_syscon0 1 4>;\n" "> \t\t\t\tdma-coherent;\n" "> @@ -231,13 +240,13 @@\n" - "> \t\t\tcpm_crypto: crypto at 800000 {\n" + "> \t\t\tcpm_crypto: crypto@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\n" @@ -258,14 +276,14 @@ "> +\t\tinterrupt-parent = <&cps_icu>;\n" "> \t\tranges;\n" "> \n" - "> \t\tconfig-space at f4000000 {\n" + "> \t\tconfig-space@f4000000 {\n" "> \t\t\t#address-cells = <1>;\n" "> \t\t\t#size-cells = <1>;\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> -\t\t\tinterrupt-parent = <&gic>;\n" "> \t\t\tranges = <0x0 0x0 0xf4000000 0x2000000>;\n" "> \n" - "> \t\t\tcps_rtc: rtc at 284000 {\n" + "> \t\t\tcps_rtc: rtc@284000 {\n" "> @@ -75,21 +74,21 @@\n" "> \t\t\t\tdma-coherent;\n" "> \n" @@ -295,7 +313,7 @@ "> \t\t\t\treg = <0x12a200 0x10>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tcps_icu: interrupt-controller at 1e0000 {\n" + "> +\t\t\tcps_icu: interrupt-controller@1e0000 {\n" "> +\t\t\t\tcompatible = \"marvell,cp110-icu\";\n" "> +\t\t\t\treg = <0x1e0000 0x10>;\n" "> +\t\t\t\t#interrupt-cells = <3>;\n" @@ -303,7 +321,7 @@ "> +\t\t\t\tmsi-parent = <&gicp>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tcps_syscon0: system-controller at 440000 {\n" + "> \t\t\tcps_syscon0: system-controller@440000 {\n" "> \t\t\t\tcompatible = \"marvell,cp110-system-controller0\",\n" "> \t\t\t\t\t \"syscon\";\n" "> @@ -127,7 +134,7 @@\n" @@ -352,7 +370,7 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> @@ -213,7 +220,7 @@\n" - "> \t\t\tcps_trng: trng at 760000 {\n" + "> \t\t\tcps_trng: trng@760000 {\n" "> \t\t\t\tcompatible = \"marvell,armada-8k-rng\", \"inside-secure,safexcel-eip76\";\n" "> \t\t\t\treg = <0x760000 0x7d>;\n" "> -\t\t\t\tinterrupts = <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -361,7 +379,7 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> @@ -221,13 +228,13 @@\n" - "> \t\t\tcps_crypto: crypto at 800000 {\n" + "> \t\t\tcps_crypto: crypto@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\n" @@ -423,4 +441,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -4b1efcaf52193548ed88d5e600775e02f30a61968c3453af0d54e68e27f19019 +bd00b9858dc33e380fc9e1f2cb6c3ae6db1a4ac2b11eef0bc0ec7d704233ccf3
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.