diff for duplicates of <539ED38A.3010205@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 578994a..7489246 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,11 +1,11 @@ -On 06/03/2014 09:33 AM, Antoine T?nart wrote: +On 06/03/2014 09:33 AM, Antoine Ténart wrote: > The Marvell Berlin BG2Q has 4 TWSI compatible with the Synopsys > DesignWare I2C driver. Add the corresponding nodes. > > The pin-muxing setup is also done here, since there cannot be another > muxing setup if I2C{0,1,2,3} are enabled. > -> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com> +> Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> Applied to berlin/dt. @@ -23,7 +23,7 @@ Thanks! > }; > }; > -> + i2c0: i2c at 1400 { +> + i2c0: i2c@1400 { > + compatible = "snps,designware-i2c"; > + #address-cells = <1>; > + #size-cells = <0>; @@ -36,7 +36,7 @@ Thanks! > + status = "disabled"; > + }; > + -> + i2c1: i2c at 1800 { +> + i2c1: i2c@1800 { > + compatible = "snps,designware-i2c"; > + #address-cells = <1>; > + #size-cells = <0>; @@ -49,7 +49,7 @@ Thanks! > + status = "disabled"; > + }; > + -> timer0: timer at 2c00 { +> timer0: timer@2c00 { > compatible = "snps,dw-apb-timer"; > reg = <0x2c00 0x14>; > @@ -301,6 +327,16 @@ @@ -68,12 +68,12 @@ Thanks! > + }; > }; > -> apb at fc0000 { +> apb@fc0000 { > @@ -311,6 +347,32 @@ > ranges = <0 0xfc0000 0x10000>; > interrupt-parent = <&sic>; > -> + i2c2: i2c at 7000 { +> + i2c2: i2c@7000 { > + compatible = "snps,designware-i2c"; > + #address-cells = <1>; > + #size-cells = <0>; @@ -86,7 +86,7 @@ Thanks! > + status = "disabled"; > + }; > + -> + i2c3: i2c at 8000 { +> + i2c3: i2c@8000 { > + compatible = "snps,designware-i2c"; > + #address-cells = <1>; > + #size-cells = <0>; @@ -99,7 +99,7 @@ Thanks! > + status = "disabled"; > + }; > + -> uart0: uart at 9000 { +> uart0: uart@9000 { > compatible = "snps,dw-apb-uart"; > reg = <0x9000 0x100>; > @@ -348,6 +410,16 @@ @@ -118,5 +118,5 @@ Thanks! > + }; > }; > -> sic: interrupt-controller at e000 { +> sic: interrupt-controller@e000 { > diff --git a/a/content_digest b/N1/content_digest index 83023bb..7909430 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,26 @@ "ref\01401780790-17830-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01401780790-17830-2-git-send-email-antoine.tenart@free-electrons.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH 1/2] ARM: dts: berlin: add I2C nodes for BG2Q\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH 1/2] ARM: dts: berlin: add I2C nodes for BG2Q\0" "Date\0Mon, 16 Jun 2014 13:22:50 +0200\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" + thomas.petazzoni@free-electrons.com + zmxu@marvell.com + jszhang@marvell.com + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" - "On 06/03/2014 09:33 AM, Antoine T?nart wrote:\n" + "On 06/03/2014 09:33 AM, Antoine T\303\203\302\251nart wrote:\n" "> The Marvell Berlin BG2Q has 4 TWSI compatible with the Synopsys\n" "> DesignWare I2C driver. Add the corresponding nodes.\n" ">\n" "> The pin-muxing setup is also done here, since there cannot be another\n" "> muxing setup if I2C{0,1,2,3} are enabled.\n" ">\n" - "> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com>\n" + "> Signed-off-by: Antoine T\303\203\302\251nart <antoine.tenart@free-electrons.com>\n" "\n" "Applied to berlin/dt.\n" "\n" @@ -31,7 +38,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> +\t\t\ti2c0: i2c at 1400 {\n" + "> +\t\t\ti2c0: i2c@1400 {\n" "> +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" @@ -44,7 +51,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c1: i2c at 1800 {\n" + "> +\t\t\ti2c1: i2c@1800 {\n" "> +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" @@ -57,7 +64,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\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" "> @@ -301,6 +327,16 @@\n" @@ -76,12 +83,12 @@ "> +\t\t\t};\n" "> \t\t};\n" ">\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> @@ -311,6 +347,32 @@\n" "> \t\t\tranges = <0 0xfc0000 0x10000>;\n" "> \t\t\tinterrupt-parent = <&sic>;\n" ">\n" - "> +\t\t\ti2c2: i2c at 7000 {\n" + "> +\t\t\ti2c2: i2c@7000 {\n" "> +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" @@ -94,7 +101,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c3: i2c at 8000 {\n" + "> +\t\t\ti2c3: i2c@8000 {\n" "> +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" @@ -107,7 +114,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tuart0: uart at 9000 {\n" + "> \t\t\tuart0: uart@9000 {\n" "> \t\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> \t\t\t\treg = <0x9000 0x100>;\n" "> @@ -348,6 +410,16 @@\n" @@ -126,7 +133,7 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> \t\t\tsic: interrupt-controller at e000 {\n" + "> \t\t\tsic: interrupt-controller@e000 {\n" > -3c1cfd208630d61684f432a8e95ac781eb31acb611823c3becf69316aaef94a0 +8edede7d5fa62d1f007c01d0344134c5fde15ed310ee4a6ae22214a179c752f4
diff --git a/a/1.txt b/N2/1.txt index 578994a..12dfceb 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,11 +1,11 @@ -On 06/03/2014 09:33 AM, Antoine T?nart wrote: +On 06/03/2014 09:33 AM, Antoine Ténart wrote: > The Marvell Berlin BG2Q has 4 TWSI compatible with the Synopsys > DesignWare I2C driver. Add the corresponding nodes. > > The pin-muxing setup is also done here, since there cannot be another > muxing setup if I2C{0,1,2,3} are enabled. > -> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com> +> Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> Applied to berlin/dt. @@ -23,7 +23,7 @@ Thanks! > }; > }; > -> + i2c0: i2c at 1400 { +> + i2c0: i2c@1400 { > + compatible = "snps,designware-i2c"; > + #address-cells = <1>; > + #size-cells = <0>; @@ -36,7 +36,7 @@ Thanks! > + status = "disabled"; > + }; > + -> + i2c1: i2c at 1800 { +> + i2c1: i2c@1800 { > + compatible = "snps,designware-i2c"; > + #address-cells = <1>; > + #size-cells = <0>; @@ -49,7 +49,7 @@ Thanks! > + status = "disabled"; > + }; > + -> timer0: timer at 2c00 { +> timer0: timer@2c00 { > compatible = "snps,dw-apb-timer"; > reg = <0x2c00 0x14>; > @@ -301,6 +327,16 @@ @@ -68,12 +68,12 @@ Thanks! > + }; > }; > -> apb at fc0000 { +> apb@fc0000 { > @@ -311,6 +347,32 @@ > ranges = <0 0xfc0000 0x10000>; > interrupt-parent = <&sic>; > -> + i2c2: i2c at 7000 { +> + i2c2: i2c@7000 { > + compatible = "snps,designware-i2c"; > + #address-cells = <1>; > + #size-cells = <0>; @@ -86,7 +86,7 @@ Thanks! > + status = "disabled"; > + }; > + -> + i2c3: i2c at 8000 { +> + i2c3: i2c@8000 { > + compatible = "snps,designware-i2c"; > + #address-cells = <1>; > + #size-cells = <0>; @@ -99,7 +99,7 @@ Thanks! > + status = "disabled"; > + }; > + -> uart0: uart at 9000 { +> uart0: uart@9000 { > compatible = "snps,dw-apb-uart"; > reg = <0x9000 0x100>; > @@ -348,6 +410,16 @@ @@ -118,5 +118,5 @@ Thanks! > + }; > }; > -> sic: interrupt-controller at e000 { +> sic: interrupt-controller@e000 { > diff --git a/a/content_digest b/N2/content_digest index 83023bb..2b5bb8f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,19 +1,26 @@ "ref\01401780790-17830-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01401780790-17830-2-git-send-email-antoine.tenart@free-electrons.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH 1/2] ARM: dts: berlin: add I2C nodes for BG2Q\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH 1/2] ARM: dts: berlin: add I2C nodes for BG2Q\0" "Date\0Mon, 16 Jun 2014 13:22:50 +0200\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" + thomas.petazzoni@free-electrons.com + zmxu@marvell.com + jszhang@marvell.com + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" - "On 06/03/2014 09:33 AM, Antoine T?nart wrote:\n" + "On 06/03/2014 09:33 AM, Antoine T\303\251nart wrote:\n" "> The Marvell Berlin BG2Q has 4 TWSI compatible with the Synopsys\n" "> DesignWare I2C driver. Add the corresponding nodes.\n" ">\n" "> The pin-muxing setup is also done here, since there cannot be another\n" "> muxing setup if I2C{0,1,2,3} are enabled.\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" "\n" "Applied to berlin/dt.\n" "\n" @@ -31,7 +38,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> +\t\t\ti2c0: i2c at 1400 {\n" + "> +\t\t\ti2c0: i2c@1400 {\n" "> +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" @@ -44,7 +51,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c1: i2c at 1800 {\n" + "> +\t\t\ti2c1: i2c@1800 {\n" "> +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" @@ -57,7 +64,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\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" "> @@ -301,6 +327,16 @@\n" @@ -76,12 +83,12 @@ "> +\t\t\t};\n" "> \t\t};\n" ">\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> @@ -311,6 +347,32 @@\n" "> \t\t\tranges = <0 0xfc0000 0x10000>;\n" "> \t\t\tinterrupt-parent = <&sic>;\n" ">\n" - "> +\t\t\ti2c2: i2c at 7000 {\n" + "> +\t\t\ti2c2: i2c@7000 {\n" "> +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" @@ -94,7 +101,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c3: i2c at 8000 {\n" + "> +\t\t\ti2c3: i2c@8000 {\n" "> +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" @@ -107,7 +114,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tuart0: uart at 9000 {\n" + "> \t\t\tuart0: uart@9000 {\n" "> \t\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> \t\t\t\treg = <0x9000 0x100>;\n" "> @@ -348,6 +410,16 @@\n" @@ -126,7 +133,7 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> \t\t\tsic: interrupt-controller at e000 {\n" + "> \t\t\tsic: interrupt-controller@e000 {\n" > -3c1cfd208630d61684f432a8e95ac781eb31acb611823c3becf69316aaef94a0 +5f5d5eb9946a374d2236f246ca5f95b29f860ccb6a1a22c1d9c6596482f9f692
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.