diff for duplicates of <54B56546.9050407@arm.com> diff --git a/a/1.txt b/N1/1.txt index 870d4ed..381b899 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ On 12/01/15 19:00, Stefan Agner wrote: >> + interrupt-parent = <&gpc>; >> ranges; >> ->> dma_apbh: dma-apbh@00110000 { +>> dma_apbh: dma-apbh at 00110000 { >> @@ -122,6 +123,7 @@ >> compatible = "arm,cortex-a9-twd-timer"; >> reg = <0x00a00600 0x20>; @@ -59,7 +59,7 @@ On 12/01/15 19:00, Stefan Agner wrote: >> }; >> >> @@ -694,8 +696,11 @@ ->> gpc: gpc@020dc000 { +>> gpc: gpc at 020dc000 { >> compatible = "fsl,imx6q-gpc"; >> reg = <0x020dc000 0x4000>; >> + interrupt-controller; @@ -69,7 +69,7 @@ On 12/01/15 19:00, Stefan Agner wrote: >> + interrupt-parent = <&intc>; >> }; >> ->> gpr: iomuxc-gpr@020e0000 { +>> gpr: iomuxc-gpr at 020e0000 { >> diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi >> index 36ab8e0..35099b7 100644 >> --- a/arch/arm/boot/dts/imx6sl.dtsi @@ -90,9 +90,9 @@ On 12/01/15 19:00, Stefan Agner wrote: >> + interrupt-parent = <&gpc>; >> ranges; >> ->> ocram: sram@00900000 { +>> ocram: sram at 00900000 { >> @@ -603,7 +604,9 @@ ->> gpc: gpc@020dc000 { +>> gpc: gpc at 020dc000 { >> compatible = "fsl,imx6sl-gpc", "fsl,imx6q-gpc"; >> reg = <0x020dc000 0x4000>; >> + interrupt-controller; @@ -106,7 +106,7 @@ On 12/01/15 19:00, Stefan Agner wrote: >> + interrupt-parent = <&intc>; >> }; >> ->> gpr: iomuxc-gpr@020e0000 { +>> gpr: iomuxc-gpr at 020e0000 { >> diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi >> index 7a24fee..c476e67 100644 >> --- a/arch/arm/boot/dts/imx6sx.dtsi @@ -129,7 +129,7 @@ On 12/01/15 19:00, Stefan Agner wrote: >> >> pmu { >> @@ -700,7 +701,9 @@ ->> gpc: gpc@020dc000 { +>> gpc: gpc at 020dc000 { >> compatible = "fsl,imx6sx-gpc", "fsl,imx6q-gpc"; >> reg = <0x020dc000 0x4000>; >> + interrupt-controller; diff --git a/a/content_digest b/N1/content_digest index e431b9e..e3e839e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,31 +1,10 @@ "ref\01421087187-26988-1-git-send-email-marc.zyngier@arm.com\0" "ref\01421087187-26988-15-git-send-email-marc.zyngier@arm.com\0" "ref\0069e9a2b9e74856273b2faef90a97c87@agner.ch\0" - "From\0Marc Zyngier <marc.zyngier@arm.com>\0" - "Subject\0Re: [PATCH v3 14/21] ARM: imx6: convert GPC to stacked domains\0" + "From\0marc.zyngier@arm.com (Marc Zyngier)\0" + "Subject\0[PATCH v3 14/21] ARM: imx6: convert GPC to stacked domains\0" "Date\0Tue, 13 Jan 2015 18:34:46 +0000\0" - "To\0Stefan Agner <stefan@agner.ch>\0" - "Cc\0Stephen Warren <swarren@wwwdotorg.org>" - Thierry Reding <thierry.reding@gmail.com> - Alexandre Courbot <gnurou@gmail.com> - Benoit Cousson <bcousson@baylibre.com> - Tony Lindgren <tony@atomide.com> - Nishanth Menon <nm@ti.com> - Santosh Shilimkar <ssantosh@kernel.org> - Shawn Guo <shawn.guo@linaro.org> - Sascha Hauer <kernel@pengutronix.de> - Kukjin Kim <kgene.kim@samsung.com> - Simon Horman <horms@verge.net.au> - Magnus Damm <magnus.damm@gmail.com> - Linus Walleij <linus.walleij@linaro.org> - Michal Simek <michal.simek@xilinx.com> - Rob Herring <robh+dt@kernel.org> - Mark Rutland <Mark.Rutland@arm.com> - Jason Cooper <jason@lakedaemon.net> - Thomas Gleixner <tglx@linutronix.de> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - linux-samsung-soc@vger.kernel.org <linux-samsung-soc@vger.kernel.org> - " linux-omap@vger.kernel.org <linux-omap@vger.ker>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 12/01/15 19:00, Stefan Agner wrote:\n" @@ -79,7 +58,7 @@ ">> + interrupt-parent = <&gpc>;\n" ">> ranges;\n" ">>\n" - ">> dma_apbh: dma-apbh@00110000 {\n" + ">> dma_apbh: dma-apbh at 00110000 {\n" ">> @@ -122,6 +123,7 @@\n" ">> compatible = \"arm,cortex-a9-twd-timer\";\n" ">> reg = <0x00a00600 0x20>;\n" @@ -89,7 +68,7 @@ ">> };\n" ">>\n" ">> @@ -694,8 +696,11 @@\n" - ">> gpc: gpc@020dc000 {\n" + ">> gpc: gpc at 020dc000 {\n" ">> compatible = \"fsl,imx6q-gpc\";\n" ">> reg = <0x020dc000 0x4000>;\n" ">> + interrupt-controller;\n" @@ -99,7 +78,7 @@ ">> + interrupt-parent = <&intc>;\n" ">> };\n" ">>\n" - ">> gpr: iomuxc-gpr@020e0000 {\n" + ">> gpr: iomuxc-gpr at 020e0000 {\n" ">> diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi\n" ">> index 36ab8e0..35099b7 100644\n" ">> --- a/arch/arm/boot/dts/imx6sl.dtsi\n" @@ -120,9 +99,9 @@ ">> + interrupt-parent = <&gpc>;\n" ">> ranges;\n" ">>\n" - ">> ocram: sram@00900000 {\n" + ">> ocram: sram at 00900000 {\n" ">> @@ -603,7 +604,9 @@\n" - ">> gpc: gpc@020dc000 {\n" + ">> gpc: gpc at 020dc000 {\n" ">> compatible = \"fsl,imx6sl-gpc\", \"fsl,imx6q-gpc\";\n" ">> reg = <0x020dc000 0x4000>;\n" ">> + interrupt-controller;\n" @@ -136,7 +115,7 @@ ">> + interrupt-parent = <&intc>;\n" ">> };\n" ">>\n" - ">> gpr: iomuxc-gpr@020e0000 {\n" + ">> gpr: iomuxc-gpr at 020e0000 {\n" ">> diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi\n" ">> index 7a24fee..c476e67 100644\n" ">> --- a/arch/arm/boot/dts/imx6sx.dtsi\n" @@ -159,7 +138,7 @@ ">>\n" ">> pmu {\n" ">> @@ -700,7 +701,9 @@\n" - ">> gpc: gpc@020dc000 {\n" + ">> gpc: gpc at 020dc000 {\n" ">> compatible = \"fsl,imx6sx-gpc\", \"fsl,imx6q-gpc\";\n" ">> reg = <0x020dc000 0x4000>;\n" ">> + interrupt-controller;\n" @@ -178,4 +157,4 @@ "-- \n" Jazz is not dead. It just smells funny... -0636a25f25d0b6e52f7081f92e93ffe3aafaf30ef319640c4b8aebc6f405798d +a584731ba392df260acbe96a08c0d2bd628c3bca903ecd9ebfb71cbe2b202f0e
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.