diff for duplicates of <5451345B.5000703@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 018c2b5..b0e481c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,11 +12,11 @@ Sebastian > --- > Cc: Chris Ball <chris@printf.net> > Cc: Ulf Hansson <ulf.hansson@linaro.org> -> Cc: "Antoine Ténart" <antoine.tenart@free-electrons.com> -> Cc: linux-mmc@vger.kernel.org -> Cc: devicetree@vger.kernel.org -> Cc: linux-arm-kernel@lists.infradead.org -> Cc: linux-kernel@vger.kernel.org +> Cc: "Antoine T?nart" <antoine.tenart@free-electrons.com> +> Cc: linux-mmc at vger.kernel.org +> Cc: devicetree at vger.kernel.org +> Cc: linux-arm-kernel at lists.infradead.org +> Cc: linux-kernel at vger.kernel.org > --- > arch/arm/boot/dts/berlin2.dtsi | 34 ++++++++++++++++++++++++++++++++++ > arch/arm/boot/dts/berlin2cd.dtsi | 9 +++++++++ @@ -30,7 +30,7 @@ Sebastian > > ranges = <0 0xf7000000 0x1000000>; > -> + sdhci0: sdhci@ab0000 { +> + sdhci0: sdhci at ab0000 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab0000 0x200>; > + clocks = <&chip CLKID_SDIO0XIN>, <&chip CLKID_SDIO0>; @@ -39,7 +39,7 @@ Sebastian > + status = "disabled"; > + }; > + -> + sdhci1: sdhci@ab0800 { +> + sdhci1: sdhci at ab0800 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab0800 0x200>; > + clocks = <&chip CLKID_SDIO1XIN>, <&chip CLKID_SDIO1>; @@ -48,7 +48,7 @@ Sebastian > + status = "disabled"; > + }; > + -> + sdhci2: sdhci@ab1000 { +> + sdhci2: sdhci at ab1000 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab1000 0x200>; > + interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; @@ -59,7 +59,7 @@ Sebastian > + status = "disabled"; > + }; > + -> l2: l2-cache-controller@ac0000 { +> l2: l2-cache-controller at ac0000 { > compatible = "marvell,tauros3-cache", "arm,pl310-cache"; > reg = <0xac0000 0x1000>; > @@ -252,6 +281,11 @@ @@ -73,7 +73,7 @@ Sebastian > + }; > }; > -> apb@fc0000 { +> apb at fc0000 { > diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi > index cc1df65da504..5a19017b5d71 100644 > --- a/arch/arm/boot/dts/berlin2cd.dtsi @@ -82,7 +82,7 @@ Sebastian > > ranges = <0 0xf7000000 0x1000000>; > -> + sdhci0: sdhci@ab0000 { +> + sdhci0: sdhci at ab0000 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab0000 0x200>; > + clocks = <&chip CLKID_SDIO0XIN>, <&chip CLKID_SDIO0>; @@ -91,7 +91,7 @@ Sebastian > + status = "disabled"; > + }; > + -> l2: l2-cache-controller@ac0000 { +> l2: l2-cache-controller at ac0000 { > compatible = "arm,pl310-cache"; > reg = <0xac0000 0x1000>; > diff --git a/a/content_digest b/N1/content_digest index 954158d..f8aba30 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,9 @@ "ref\01413883364-681-1-git-send-email-sebastian.hesselbarth@gmail.com\0" "ref\01413883364-681-11-git-send-email-sebastian.hesselbarth@gmail.com\0" - "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" - "Subject\0Re: [PATCH RESEND 10/12] ARM: dts: berlin: Add SDHCI controller nodes to BG2/BG2CD\0" + "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" + "Subject\0[PATCH RESEND 10/12] ARM: dts: berlin: Add SDHCI controller nodes to BG2/BG2CD\0" "Date\0Wed, 29 Oct 2014 19:39:23 +0100\0" - "Cc\0Chris Ball <chris@printf.net>" - Ulf Hansson <ulf.hansson@linaro.org> - " Antoine T\303\251nart <antoine.tenart@free-electrons.com>" - linux-mmc@vger.kernel.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 21.10.2014 11:22, Sebastian Hesselbarth wrote:\n" @@ -26,11 +20,11 @@ "> ---\n" "> Cc: Chris Ball <chris@printf.net>\n" "> Cc: Ulf Hansson <ulf.hansson@linaro.org>\n" - "> Cc: \"Antoine T\303\203\302\251nart\" <antoine.tenart@free-electrons.com>\n" - "> Cc: linux-mmc@vger.kernel.org\n" - "> Cc: devicetree@vger.kernel.org\n" - "> Cc: linux-arm-kernel@lists.infradead.org\n" - "> Cc: linux-kernel@vger.kernel.org\n" + "> Cc: \"Antoine T?nart\" <antoine.tenart@free-electrons.com>\n" + "> Cc: linux-mmc at vger.kernel.org\n" + "> Cc: devicetree at vger.kernel.org\n" + "> Cc: linux-arm-kernel at lists.infradead.org\n" + "> Cc: linux-kernel at vger.kernel.org\n" "> ---\n" "> arch/arm/boot/dts/berlin2.dtsi | 34 ++++++++++++++++++++++++++++++++++\n" "> arch/arm/boot/dts/berlin2cd.dtsi | 9 +++++++++\n" @@ -44,7 +38,7 @@ ">\n" "> \t\tranges = <0 0xf7000000 0x1000000>;\n" ">\n" - "> +\t\tsdhci0: sdhci@ab0000 {\n" + "> +\t\tsdhci0: sdhci at ab0000 {\n" "> +\t\t\tcompatible = \"mrvl,pxav3-mmc\";\n" "> +\t\t\treg = <0xab0000 0x200>;\n" "> +\t\t\tclocks = <&chip CLKID_SDIO0XIN>, <&chip CLKID_SDIO0>;\n" @@ -53,7 +47,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tsdhci1: sdhci@ab0800 {\n" + "> +\t\tsdhci1: sdhci at ab0800 {\n" "> +\t\t\tcompatible = \"mrvl,pxav3-mmc\";\n" "> +\t\t\treg = <0xab0800 0x200>;\n" "> +\t\t\tclocks = <&chip CLKID_SDIO1XIN>, <&chip CLKID_SDIO1>;\n" @@ -62,7 +56,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tsdhci2: sdhci@ab1000 {\n" + "> +\t\tsdhci2: sdhci at ab1000 {\n" "> +\t\t\tcompatible = \"mrvl,pxav3-mmc\";\n" "> +\t\t\treg = <0xab1000 0x200>;\n" "> +\t\t\tinterrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -73,7 +67,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tl2: l2-cache-controller@ac0000 {\n" + "> \t\tl2: l2-cache-controller at ac0000 {\n" "> \t\t\tcompatible = \"marvell,tauros3-cache\", \"arm,pl310-cache\";\n" "> \t\t\treg = <0xac0000 0x1000>;\n" "> @@ -252,6 +281,11 @@\n" @@ -87,7 +81,7 @@ "> +\t\t\t};\n" "> \t\t};\n" ">\n" - "> \t\tapb@fc0000 {\n" + "> \t\tapb at fc0000 {\n" "> diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi\n" "> index cc1df65da504..5a19017b5d71 100644\n" "> --- a/arch/arm/boot/dts/berlin2cd.dtsi\n" @@ -96,7 +90,7 @@ ">\n" "> \t\tranges = <0 0xf7000000 0x1000000>;\n" ">\n" - "> +\t\tsdhci0: sdhci@ab0000 {\n" + "> +\t\tsdhci0: sdhci at ab0000 {\n" "> +\t\t\tcompatible = \"mrvl,pxav3-mmc\";\n" "> +\t\t\treg = <0xab0000 0x200>;\n" "> +\t\t\tclocks = <&chip CLKID_SDIO0XIN>, <&chip CLKID_SDIO0>;\n" @@ -105,9 +99,9 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tl2: l2-cache-controller@ac0000 {\n" + "> \t\tl2: l2-cache-controller at ac0000 {\n" "> \t\t\tcompatible = \"arm,pl310-cache\";\n" "> \t\t\treg = <0xac0000 0x1000>;\n" > -d13b8c7ea55513dc2cefe480d7aade62f82b0ddcc29a0403641fbf39e535de06 +f17cde0471e3dc99674cdad116d8bb748152e94b558d06e7cb7c1acf8aede286
diff --git a/a/1.txt b/N2/1.txt index 018c2b5..c920278 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,7 +12,7 @@ Sebastian > --- > Cc: Chris Ball <chris@printf.net> > Cc: Ulf Hansson <ulf.hansson@linaro.org> -> Cc: "Antoine Ténart" <antoine.tenart@free-electrons.com> +> Cc: "Antoine Ténart" <antoine.tenart@free-electrons.com> > Cc: linux-mmc@vger.kernel.org > Cc: devicetree@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org diff --git a/a/content_digest b/N2/content_digest index 954158d..d8c23d0 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,6 +3,7 @@ "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" "Subject\0Re: [PATCH RESEND 10/12] ARM: dts: berlin: Add SDHCI controller nodes to BG2/BG2CD\0" "Date\0Wed, 29 Oct 2014 19:39:23 +0100\0" + "To\0unlisted-recipients:; (no To-header on input)\0" "Cc\0Chris Ball <chris@printf.net>" Ulf Hansson <ulf.hansson@linaro.org> " Antoine T\303\251nart <antoine.tenart@free-electrons.com>" @@ -26,7 +27,7 @@ "> ---\n" "> Cc: Chris Ball <chris@printf.net>\n" "> Cc: Ulf Hansson <ulf.hansson@linaro.org>\n" - "> Cc: \"Antoine T\303\203\302\251nart\" <antoine.tenart@free-electrons.com>\n" + "> Cc: \"Antoine T\303\251nart\" <antoine.tenart@free-electrons.com>\n" "> Cc: linux-mmc@vger.kernel.org\n" "> Cc: devicetree@vger.kernel.org\n" "> Cc: linux-arm-kernel@lists.infradead.org\n" @@ -110,4 +111,4 @@ "> \t\t\treg = <0xac0000 0x1000>;\n" > -d13b8c7ea55513dc2cefe480d7aade62f82b0ddcc29a0403641fbf39e535de06 +0e3c43ade70ce4a285b584bf3450687213605a63f9dbb9114879e636db5873a6
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.