diff for duplicates of <87h8z91gri.fsf@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index 977dea8..02baa40 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,14 +28,14 @@ Gregory > 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 @@ -57,14 +57,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; > @@ -94,7 +94,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>; @@ -102,7 +102,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 @@ @@ -113,7 +113,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>; @@ -159,7 +159,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>; @@ -168,7 +168,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>; @@ -177,7 +177,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 @@ -248,14 +248,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 +76,21 @@ > dma-coherent; > @@ -285,7 +285,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>; @@ -293,7 +293,7 @@ Gregory > + msi-parent = <&gicp>; > + }; > + -> cps_syscon0: system-controller at 440000 { +> cps_syscon0: system-controller@440000 { > compatible = "marvell,cp110-system-controller0", > "syscon"; > @@ -127,7 +136,7 @@ @@ -342,7 +342,7 @@ Gregory > status = "disabled"; > }; > @@ -213,7 +222,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>; @@ -351,7 +351,7 @@ Gregory > status = "okay"; > }; > @@ -221,13 +230,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/N1/content_digest index d27ea8d..c0888aa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,27 @@ "ref\020170621132917.14187-1-thomas.petazzoni@free-electrons.com\0" "ref\020170621132917.14187-7-thomas.petazzoni@free-electrons.com\0" - "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" - "Subject\0[PATCH v5 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 v5 6/6] arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K\0" "Date\0Wed, 21 Jun 2017 17:50:57 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Thomas Petazzoni <thomas.petazzoni@free-electrons.com>\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + devicetree@vger.kernel.org + Yehuda Yitschak <yehuday@marvell.com> + Jason Cooper <jason@lakedaemon.net> + Pawel Moll <pawel.moll@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Marc Zyngier <marc.zyngier@arm.com> + Hanna Hawa <hannah@marvell.com> + " Miqu\303\250l Raynal <miquel.raynal@free-electrons.com>" + linux-kernel@vger.kernel.org + Nadav Haklai <nadavh@marvell.com> + Rob Herring <robh+dt@kernel.org> + Andrew Lunn <andrew@lunn.ch> + Kumar Gala <galak@codeaurora.org> + Thomas Gleixner <tglx@linutronix.de> + Antoine Tenart <antoine.tenart@free-electrons.com> + linux-arm-kernel@lists.infradead.org + " Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" "\00:1\0" "b\0" "Hi Thomas,\n" @@ -36,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" @@ -65,14 +83,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" @@ -102,7 +120,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" @@ -110,7 +128,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" @@ -121,7 +139,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" @@ -167,7 +185,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" @@ -176,7 +194,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" @@ -185,7 +203,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" @@ -256,14 +274,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 +76,21 @@\n" "> \t\t\t\tdma-coherent;\n" "> \n" @@ -293,7 +311,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" @@ -301,7 +319,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 +136,7 @@\n" @@ -350,7 +368,7 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> @@ -213,7 +222,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" @@ -359,7 +377,7 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> @@ -221,13 +230,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,4 +439,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -c2a86d4f0b8589967037a7b05a2e0730e0520ca592c3c973bdd7be591c65aad0 +3a77c6a6c52441e2fb4ad1f7470a1779e2fdf5a3bca3c641fa68786262316502
diff --git a/a/1.txt b/N2/1.txt index 977dea8..02baa40 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -28,14 +28,14 @@ Gregory > 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 @@ -57,14 +57,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; > @@ -94,7 +94,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>; @@ -102,7 +102,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 @@ @@ -113,7 +113,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>; @@ -159,7 +159,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>; @@ -168,7 +168,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>; @@ -177,7 +177,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 @@ -248,14 +248,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 +76,21 @@ > dma-coherent; > @@ -285,7 +285,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>; @@ -293,7 +293,7 @@ Gregory > + msi-parent = <&gicp>; > + }; > + -> cps_syscon0: system-controller at 440000 { +> cps_syscon0: system-controller@440000 { > compatible = "marvell,cp110-system-controller0", > "syscon"; > @@ -127,7 +136,7 @@ @@ -342,7 +342,7 @@ Gregory > status = "disabled"; > }; > @@ -213,7 +222,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>; @@ -351,7 +351,7 @@ Gregory > status = "okay"; > }; > @@ -221,13 +230,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 d27ea8d..e3b1cb3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,27 @@ "ref\020170621132917.14187-1-thomas.petazzoni@free-electrons.com\0" "ref\020170621132917.14187-7-thomas.petazzoni@free-electrons.com\0" - "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" - "Subject\0[PATCH v5 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 v5 6/6] arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K\0" "Date\0Wed, 21 Jun 2017 17:50:57 +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" @@ -36,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" @@ -65,14 +83,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" @@ -102,7 +120,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" @@ -110,7 +128,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" @@ -121,7 +139,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" @@ -167,7 +185,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" @@ -176,7 +194,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" @@ -185,7 +203,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" @@ -256,14 +274,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 +76,21 @@\n" "> \t\t\t\tdma-coherent;\n" "> \n" @@ -293,7 +311,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" @@ -301,7 +319,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 +136,7 @@\n" @@ -350,7 +368,7 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> @@ -213,7 +222,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" @@ -359,7 +377,7 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> @@ -221,13 +230,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,4 +439,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -c2a86d4f0b8589967037a7b05a2e0730e0520ca592c3c973bdd7be591c65aad0 +9f26b7579776fd5bec0c5b95e513f611cccd26ee211df4a38072cdbfb51438f5
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.