diff for duplicates of <5322D089.7010605@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index dcbd66c..7bba732 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ Sebastian, On 14/03/2014 10:31, Sebastian Hesselbarth wrote: -> On 03/13/2014 03:06 PM, Antoine T?nart wrote: +> On 03/13/2014 03:06 PM, Antoine Ténart wrote: >> + clocks { >> + #address-cells = <0>; >> + #size-cells = <0>; @@ -21,7 +21,7 @@ On 14/03/2014 10:31, Sebastian Hesselbarth wrote: >> + >> + soc { > [...] ->> + local-timer at ad0600 { +>> + local-timer@ad0600 { >> + compatible = "arm,cortex-a9-twd-timer"; >> + reg = <0xad0600 0x20>; >> + clocks = <&sysclk>; @@ -53,7 +53,7 @@ Sure, this is why I only kept one fixed clock in this patch. I'll add the cpuclk here then. ->> + timer0: timer at 2c00 { +>> + timer0: timer@2c00 { >> + compatible = "snps,dw-apb-timer"; >> + reg = <0x2c00 0x14>; >> + interrupts = <8>; @@ -61,7 +61,7 @@ I'll add the cpuclk here then. >> + status = "okay"; >> + }; >> + ->> + timer1: timer at 2c14 { +>> + timer1: timer@2c14 { >> + compatible = "snps,dw-apb-timer"; >> + reg = <0x2c14 0x14>; >> + clock-freq = <100000000>; @@ -77,6 +77,6 @@ Jisheng. Antoine -- -Antoine T?nart, Free Electrons +Antoine Ténart, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com diff --git a/a/content_digest b/N1/content_digest index 1bbf893..e294342 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,21 @@ "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" "ref\05322CC8B.6010905@gmail.com\0" - "From\0antoine.tenart@free-electrons.com (Antoine T\303\251nart)\0" - "Subject\0[PATCH v2 1/3] ARM: dts: berlin2q: add the Marvell Armada 1500 pro\0" + "From\0Antoine T\303\251nart <antoine.tenart@free-electrons.com>\0" + "Subject\0Re: [PATCH v2 1/3] ARM: dts: berlin2q: add the Marvell Armada 1500 pro\0" "Date\0Fri, 14 Mar 2014 10:48:57 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.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" "Sebastian,\n" "\n" "On 14/03/2014 10:31, Sebastian Hesselbarth wrote:\n" - "> 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" ">> + clocks {\n" ">> + #address-cells = <0>;\n" ">> + #size-cells = <0>;\n" @@ -30,7 +35,7 @@ ">> +\n" ">> + soc {\n" "> [...]\n" - ">> + local-timer at ad0600 {\n" + ">> + local-timer@ad0600 {\n" ">> + compatible = \"arm,cortex-a9-twd-timer\";\n" ">> + reg = <0xad0600 0x20>;\n" ">> + clocks = <&sysclk>;\n" @@ -62,7 +67,7 @@ "\n" "I'll add the cpuclk here then.\n" "\n" - ">> + timer0: timer at 2c00 {\n" + ">> + timer0: timer@2c00 {\n" ">> + compatible = \"snps,dw-apb-timer\";\n" ">> + reg = <0x2c00 0x14>;\n" ">> + interrupts = <8>;\n" @@ -70,7 +75,7 @@ ">> + status = \"okay\";\n" ">> + };\n" ">> +\n" - ">> + timer1: timer at 2c14 {\n" + ">> + timer1: timer@2c14 {\n" ">> + compatible = \"snps,dw-apb-timer\";\n" ">> + reg = <0x2c14 0x14>;\n" ">> + clock-freq = <100000000>;\n" @@ -86,8 +91,8 @@ "Antoine\n" "\n" "-- \n" - "Antoine T?nart, Free Electrons\n" + "Antoine T\303\251nart, Free Electrons\n" "Embedded Linux, Kernel and Android engineering\n" http://free-electrons.com -85d4936bfffed9a05d39583ed127c197971a2e990850ab300a7149453d7dc414 +c58ce99c798f78e829dbdafe63239dbe0cb514a4bf5e2bdff86c104797135159
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.