diff for duplicates of <20140313190206.762108a2@xhacker> diff --git a/a/1.txt b/N1/1.txt index 2f26f56..e7b8634 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ On Thu, 13 Mar 2014 03:43:03 -0700 Alexandre Belloni <alexandre.belloni@free-electrons.com> wrote: > On 13/03/2014 at 10:05:31 +0000, Sebastian Hesselbarth wrote : -> > On 03/12/2014 11:06 AM, Antoine T?nart wrote: +> > On 03/12/2014 11:06 AM, Antoine Ténart wrote: > > >+ compatible = "arm,cortex-a9-twd-timer"; > > >+ reg = <0xad0600 0x20>; > > >+ clocks = <&sysclk>; @@ -27,7 +27,7 @@ is cpuclk. > > >+ status = "okay"; > > >+ }; > > >+ -> > >+ apb at e80000 { +> > >+ apb@e80000 { > > >+ compatible = "simple-bus"; > > >+ #address-cells = <1>; > > >+ #size-cells = <1>; @@ -35,7 +35,7 @@ is cpuclk. > > >+ ranges = <0 0xe80000 0x10000>; > > >+ interrupt-parent = <&aic>; > > >+ -> > >+ timer0: timer at 2c00 { +> > >+ timer0: timer@2c00 { > > >+ compatible = "snps,dw-apb-timer"; > > >+ reg = <0x2c00 0x14>; > > >+ interrupts = <8>; @@ -43,7 +43,7 @@ is cpuclk. > > >+ status = "okay"; > > >+ }; > > >+ -> > >+ timer1: timer at 2c14 { +> > >+ timer1: timer@2c14 { > > >+ compatible = "snps,dw-apb-timer"; > > >+ reg = <0x2c14 0x14>; > > >+ clock-freq = <100000000>; diff --git a/a/content_digest b/N1/content_digest index d9ea072..f93078a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,10 +2,15 @@ "ref\01394622364-6848-2-git-send-email-antoine.tenart@free-electrons.com\0" "ref\0532182EB.7090002@gmail.com\0" "ref\020140313104303.GB4418@piout.net\0" - "From\0jszhang@marvell.com (Jisheng Zhang)\0" - "Subject\0[PATCH 1/2] ARM: dts: berlin2q: add the Marvell Armada 1500 pro (BG2Q) device tree\0" + "From\0Jisheng Zhang <jszhang@marvell.com>\0" + "Subject\0Re: [PATCH 1/2] ARM: dts: berlin2q: add the Marvell Armada 1500 pro (BG2Q) device tree\0" "Date\0Thu, 13 Mar 2014 19:02:06 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" + "Cc\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>" + " Antoine T\303\251nart <antoine.tenart@free-electrons.com>" + Jimmy Xu <zmxu@marvell.com> + linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + " linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "Hi,\n" @@ -14,7 +19,7 @@ "Alexandre Belloni <alexandre.belloni@free-electrons.com> wrote:\n" "\n" "> On 13/03/2014 at 10:05:31 +0000, Sebastian Hesselbarth wrote :\n" - "> > On 03/12/2014 11:06 AM, Antoine T?nart wrote:\n" + "> > On 03/12/2014 11:06 AM, Antoine T\303\251nart wrote:\n" "> > >+\t\t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" "> > >+\t\t\treg = <0xad0600 0x20>;\n" "> > >+\t\t\tclocks = <&sysclk>;\n" @@ -37,7 +42,7 @@ "> > >+\t\t\tstatus = \"okay\";\n" "> > >+\t\t};\n" "> > >+\n" - "> > >+\t\tapb at e80000 {\n" + "> > >+\t\tapb@e80000 {\n" "> > >+\t\t\tcompatible = \"simple-bus\";\n" "> > >+\t\t\t#address-cells = <1>;\n" "> > >+\t\t\t#size-cells = <1>;\n" @@ -45,7 +50,7 @@ "> > >+\t\t\tranges = <0 0xe80000 0x10000>;\n" "> > >+\t\t\tinterrupt-parent = <&aic>;\n" "> > >+\n" - "> > >+\t\t\ttimer0: timer at 2c00 {\n" + "> > >+\t\t\ttimer0: timer@2c00 {\n" "> > >+\t\t\t\tcompatible = \"snps,dw-apb-timer\";\n" "> > >+\t\t\t\treg = <0x2c00 0x14>;\n" "> > >+\t\t\t\tinterrupts = <8>;\n" @@ -53,7 +58,7 @@ "> > >+\t\t\t\tstatus = \"okay\";\n" "> > >+\t\t\t};\n" "> > >+\n" - "> > >+\t\t\ttimer1: timer at 2c14 {\n" + "> > >+\t\t\ttimer1: timer@2c14 {\n" "> > >+\t\t\t\tcompatible = \"snps,dw-apb-timer\";\n" "> > >+\t\t\t\treg = <0x2c14 0x14>;\n" "> > >+\t\t\t\tclock-freq = <100000000>;\n" @@ -77,4 +82,4 @@ "Thanks,\n" Jisheng -df1fedeb3dddfe55719a8e3a6b21a3b91470d714bf71a9b341c15544846b07a1 +c5de0ec4c0231dbaddd0c3f3c541e755a9a0952866951e1f207dede0780b1171
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.