diff for duplicates of <549C0E8A.6010709@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 44b91d0..1c84616 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,7 @@ change is. > --- a/arch/arm/boot/dts/berlin2.dtsi > +++ b/arch/arm/boot/dts/berlin2.dtsi > @@ -104,7 +104,8 @@ -> local-timer at ad0600 { +> local-timer@ad0600 { > compatible = "arm,cortex-a9-twd-timer"; > reg = <0xad0600 0x20>; > - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>; @@ -39,7 +39,7 @@ Sebastian > --- a/arch/arm/boot/dts/berlin2cd.dtsi > +++ b/arch/arm/boot/dts/berlin2cd.dtsi > @@ -76,7 +76,8 @@ -> local-timer at ad0600 { +> local-timer@ad0600 { > compatible = "arm,cortex-a9-twd-timer"; > reg = <0xad0600 0x20>; > - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>; @@ -61,5 +61,5 @@ Sebastian > + IRQ_TYPE_LEVEL_HIGH)>; > }; > -> gic: interrupt-controller at ad1000 { +> gic: interrupt-controller@ad1000 { > diff --git a/a/content_digest b/N1/content_digest index 99d6a43..215f23f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,21 @@ "ref\01419487942-2277-1-git-send-email-jszhang@marvell.com\0" "ref\01419487942-2277-3-git-send-email-jszhang@marvell.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH 2/2] ARM: dts: berlin: add PPI cpu mask to twd timer interrupts\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH 2/2] ARM: dts: berlin: add PPI cpu mask to twd timer interrupts\0" "Date\0Thu, 25 Dec 2014 14:18:02 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jisheng Zhang <jszhang@marvell.com>" + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + linux@arm.linux.org.uk + antoine.tenart@free-electrons.com + alexandre.belloni@free-electrons.com + " thomas.petazzoni@free-electrons.com\0" + "Cc\0devicetree@vger.kernel.org" + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 25.12.2014 07:12, Jisheng Zhang wrote:\n" @@ -27,7 +39,7 @@ "> --- a/arch/arm/boot/dts/berlin2.dtsi\n" "> +++ b/arch/arm/boot/dts/berlin2.dtsi\n" "> @@ -104,7 +104,8 @@\n" - "> \t\tlocal-timer at ad0600 {\n" + "> \t\tlocal-timer@ad0600 {\n" "> \t\t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" "> \t\t\treg = <0xad0600 0x20>;\n" "> -\t\t\tinterrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -47,7 +59,7 @@ "> --- a/arch/arm/boot/dts/berlin2cd.dtsi\n" "> +++ b/arch/arm/boot/dts/berlin2cd.dtsi\n" "> @@ -76,7 +76,8 @@\n" - "> \t\tlocal-timer at ad0600 {\n" + "> \t\tlocal-timer@ad0600 {\n" "> \t\t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" "> \t\t\treg = <0xad0600 0x20>;\n" "> -\t\t\tinterrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -69,7 +81,7 @@ "> +\t\t\t\t\tIRQ_TYPE_LEVEL_HIGH)>;\n" "> \t\t};\n" ">\n" - "> \t\tgic: interrupt-controller at ad1000 {\n" + "> \t\tgic: interrupt-controller@ad1000 {\n" > -7ed94c1b084b25c002a64b6f75a98b82800d0cab886872f88aa5d3c96837659a +1997081acd5aadf6a769874da162e043b8124b4a06832a873f470d898733283c
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.