diff for duplicates of <5322CC8B.6010905@gmail.com> diff --git a/a/1.txt b/N1/1.txt index fbf3b1c..455f0d8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,9 +1,9 @@ -On 03/13/2014 03:06 PM, Antoine T?nart wrote: +On 03/13/2014 03:06 PM, Antoine Ténart wrote: > Adds initial support for the Marvell Armada 1500 pro (BG2Q) SoC (Berlin family). > The SoC has nodes for cpu, l2 cache controller, interrupt controllers, local > timer, apb timers and uarts for now. > -> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com> +> Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > --- > arch/arm/boot/dts/berlin2q.dtsi | 167 ++++++++++++++++++++++++++++++++++++++++ @@ -35,7 +35,7 @@ On 03/13/2014 03:06 PM, Antoine T?nart wrote: > + > + soc { [...] -> + local-timer at ad0600 { +> + local-timer@ad0600 { > + compatible = "arm,cortex-a9-twd-timer"; > + reg = <0xad0600 0x20>; > + clocks = <&sysclk>; @@ -71,7 +71,7 @@ As Mark Rutland mentioned, get rid of status = "okay" in dtsi. > + }; > + [...] -> + apb at e80000 { +> + apb@e80000 { > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <1>; @@ -79,7 +79,7 @@ As Mark Rutland mentioned, get rid of status = "okay" in dtsi. > + ranges = <0 0xe80000 0x10000>; > + interrupt-parent = <&aic>; > + -> + timer0: timer at 2c00 { +> + timer0: timer@2c00 { > + compatible = "snps,dw-apb-timer"; > + reg = <0x2c00 0x14>; > + interrupts = <8>; @@ -87,7 +87,7 @@ As Mark Rutland mentioned, get rid of status = "okay" in dtsi. > + 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 4782b6e..ad6b2cf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,22 @@ "ref\01394719607-25018-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01394719607-25018-2-git-send-email-antoine.tenart@free-electrons.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH v2 1/3] ARM: dts: berlin2q: add the Marvell Armada 1500 pro\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH v2 1/3] ARM: dts: berlin2q: add the Marvell Armada 1500 pro\0" "Date\0Fri, 14 Mar 2014 10:31:55 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Antoine T\303\251nart <antoine.tenart@free-electrons.com>\0" + "Cc\0alexandre.belloni@free-electrons.com" + zmxu@marvell.com + jszhang@marvell.com + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" - "On 03/13/2014 03:06 PM, Antoine T?nart wrote:\n" + "On 03/13/2014 03:06 PM, Antoine T\303\251nart wrote:\n" "> Adds initial support for the Marvell Armada 1500 pro (BG2Q) SoC (Berlin family).\n" "> The SoC has nodes for cpu, l2 cache controller, interrupt controllers, local\n" "> timer, apb timers and uarts for now.\n" ">\n" - "> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com>\n" + "> Signed-off-by: Antoine T\303\251nart <antoine.tenart@free-electrons.com>\n" "> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>\n" "> ---\n" "> arch/arm/boot/dts/berlin2q.dtsi | 167 ++++++++++++++++++++++++++++++++++++++++\n" @@ -43,7 +48,7 @@ "> +\n" "> +\tsoc {\n" "[...]\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\tclocks = <&sysclk>;\n" @@ -79,7 +84,7 @@ "> +\t\t};\n" "> +\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" @@ -87,7 +92,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" @@ -95,7 +100,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" @@ -106,4 +111,4 @@ "\n" Sebastian -e39ad1e6a405305192f5cf45197be0b5bef08f1ff4e08a9e83c810dc47c5c57b +200556970fb0c022af7cbc4f7142c74fe60ae0ca6af23f4d0654b92d0814f3a6
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.