diff for duplicates of <534F7A9C.2080609@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 259be50..94b64f0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,10 +1,10 @@ On 04/17/2014 05:33 AM, Jisheng Zhang wrote: > On Wed, 16 Apr 2014 05:40:10 -0700 -> Antoine Ténart <antoine.tenart@free-electrons.com> wrote: +> Antoine T?nart <antoine.tenart@free-electrons.com> wrote: >> Add the SDHCI nodes for the Marvell Berlin BG2Q, using the berlin-sdhci >> driver. [...] ->> + sdhci0: sdhci@ab0000 { +>> + sdhci0: sdhci at ab0000 { >> + compatible = "marvell,berlin2q-sdhci"; >> + reg = <0xab0000 0x200>; >> + clocks = <&sdio1clk>; @@ -15,7 +15,7 @@ On 04/17/2014 05:33 AM, Jisheng Zhang wrote: >> + status = "disabled"; >> + }; >> + ->> + sdhci1: sdhci@ab0800 { +>> + sdhci1: sdhci at ab0800 { >> + compatible = "marvell,berlin2q-sdhci"; >> + reg = <0xab0800 0x200>; >> + clocks = <&sdio1clk>; @@ -25,7 +25,7 @@ On 04/17/2014 05:33 AM, Jisheng Zhang wrote: >> + status = "disabled"; >> + }; >> + ->> + sdhci2: sdhci@ab1000 { +>> + sdhci2: sdhci at ab1000 { >> + compatible = "marvell,berlin2q-sdhci"; >> + reg = <0xab1000 0x200>; >> + interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; @@ -36,18 +36,18 @@ On 04/17/2014 05:33 AM, Jisheng Zhang wrote: >> + status = "disabled"; >> + }; > -> could we put sdhci@ab1000 at the first of sdhci lists? For two reasons: +> could we put sdhci at ab1000 at the first of sdhci lists? For two reasons: Don't reorder the nodes, but use aliases. -> 1. sdhci@ab0000 and sdhci@ab0800 is called as sdhci1 and sdhci2 in mrvl +> 1. sdhci at ab0000 and sdhci at ab0800 is called as sdhci1 and sdhci2 in mrvl > internal discussion, so this would make the name consistent when we > upgrade linux kernel to one mainline version. How about we only move the node labels? -> 2. sdhci@ab1000 is always used for emmc. if sdhci@ab0800 is put at the -> head of sdhci@ab1000, and there's one sdcard in it, mmcblock0 would be +> 2. sdhci at ab1000 is always used for emmc. if sdhci at ab0800 is put at the +> head of sdhci at ab1000, and there's one sdcard in it, mmcblock0 would be > the sdcard rather than emmc. And label this one sdhci0? diff --git a/a/content_digest b/N1/content_digest index 83ac3a9..97549b0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,28 +1,19 @@ "ref\01397652011-21284-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01397652011-21284-4-git-send-email-antoine.tenart@free-electrons.com\0" "ref\020140417113306.545ca4a7@xhacker\0" - "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" - "Subject\0Re: [PATCH 3/4] ARM: dts: berlin: add the SDHCI nodes for the BG2Q\0" + "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" + "Subject\0[PATCH 3/4] ARM: dts: berlin: add the SDHCI nodes for the BG2Q\0" "Date\0Thu, 17 Apr 2014 08:54:20 +0200\0" - "To\0Jisheng Zhang <jszhang@marvell.com>" - " Antoine T\303\251nart <antoine.tenart@free-electrons.com>\0" - "Cc\0chris@printf.net <chris@printf.net>" - anton@enomsg.org <anton@enomsg.org> - alexandre.belloni@free-electrons.com <alexandre.belloni@free-electrons.com> - Jimmy Xu <zmxu@marvell.com> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - devicetree@vger.kernel.org <devicetree@vger.kernel.org> - linux-mmc@vger.kernel.org <linux-mmc@vger.kernel.org> - " linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 04/17/2014 05:33 AM, Jisheng Zhang wrote:\n" "> On Wed, 16 Apr 2014 05:40:10 -0700\n" - "> Antoine T\303\203\302\251nart <antoine.tenart@free-electrons.com> wrote:\n" + "> Antoine T?nart <antoine.tenart@free-electrons.com> wrote:\n" ">> Add the SDHCI nodes for the Marvell Berlin BG2Q, using the berlin-sdhci\n" ">> driver.\n" "[...]\n" - ">> +\t\tsdhci0: sdhci@ab0000 {\n" + ">> +\t\tsdhci0: sdhci at ab0000 {\n" ">> +\t\t\tcompatible = \"marvell,berlin2q-sdhci\";\n" ">> +\t\t\treg = <0xab0000 0x200>;\n" ">> +\t\t\tclocks = <&sdio1clk>;\n" @@ -33,7 +24,7 @@ ">> +\t\t\tstatus = \"disabled\";\n" ">> +\t\t};\n" ">> +\n" - ">> +\t\tsdhci1: sdhci@ab0800 {\n" + ">> +\t\tsdhci1: sdhci at ab0800 {\n" ">> +\t\t\tcompatible = \"marvell,berlin2q-sdhci\";\n" ">> +\t\t\treg = <0xab0800 0x200>;\n" ">> +\t\t\tclocks = <&sdio1clk>;\n" @@ -43,7 +34,7 @@ ">> +\t\t\tstatus = \"disabled\";\n" ">> +\t\t};\n" ">> +\n" - ">> +\t\tsdhci2: sdhci@ab1000 {\n" + ">> +\t\tsdhci2: sdhci at ab1000 {\n" ">> +\t\t\tcompatible = \"marvell,berlin2q-sdhci\";\n" ">> +\t\t\treg = <0xab1000 0x200>;\n" ">> +\t\t\tinterrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -54,18 +45,18 @@ ">> +\t\t\tstatus = \"disabled\";\n" ">> +\t\t};\n" "> \n" - "> could we put sdhci@ab1000 at the first of sdhci lists? For two reasons:\n" + "> could we put sdhci at ab1000 at the first of sdhci lists? For two reasons:\n" "\n" "Don't reorder the nodes, but use aliases.\n" "\n" - "> 1. sdhci@ab0000 and sdhci@ab0800 is called as sdhci1 and sdhci2 in mrvl\n" + "> 1. sdhci at ab0000 and sdhci at ab0800 is called as sdhci1 and sdhci2 in mrvl\n" "> internal discussion, so this would make the name consistent when we\n" "> upgrade linux kernel to one mainline version.\n" "\n" "How about we only move the node labels?\n" "\n" - "> 2. sdhci@ab1000 is always used for emmc. if sdhci@ab0800 is put at the\n" - "> head of sdhci@ab1000, and there's one sdcard in it, mmcblock0 would be\n" + "> 2. sdhci at ab1000 is always used for emmc. if sdhci at ab0800 is put at the\n" + "> head of sdhci at ab1000, and there's one sdcard in it, mmcblock0 would be\n" "> the sdcard rather than emmc.\n" "\n" "And label this one sdhci0?\n" @@ -92,4 +83,4 @@ "\n" Sebastian -b53ba383899ad64b92177166413f87cffbfcd5849e839d8c22e41dffbb049982 +8341c1aa941c764c482c694075164b8f8e4252783b4f49a9da2c27333e97fc8a
diff --git a/a/1.txt b/N2/1.txt index 259be50..bff2f26 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,6 +1,6 @@ On 04/17/2014 05:33 AM, Jisheng Zhang wrote: > On Wed, 16 Apr 2014 05:40:10 -0700 -> Antoine Ténart <antoine.tenart@free-electrons.com> wrote: +> Antoine Ténart <antoine.tenart@free-electrons.com> wrote: >> Add the SDHCI nodes for the Marvell Berlin BG2Q, using the berlin-sdhci >> driver. [...] diff --git a/a/content_digest b/N2/content_digest index 83ac3a9..c432c56 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -18,7 +18,7 @@ "b\0" "On 04/17/2014 05:33 AM, Jisheng Zhang wrote:\n" "> On Wed, 16 Apr 2014 05:40:10 -0700\n" - "> Antoine T\303\203\302\251nart <antoine.tenart@free-electrons.com> wrote:\n" + "> Antoine T\303\251nart <antoine.tenart@free-electrons.com> wrote:\n" ">> Add the SDHCI nodes for the Marvell Berlin BG2Q, using the berlin-sdhci\n" ">> driver.\n" "[...]\n" @@ -92,4 +92,4 @@ "\n" Sebastian -b53ba383899ad64b92177166413f87cffbfcd5849e839d8c22e41dffbb049982 +105c995568cb7a279160f1b39cee4df5d57a6b3c31d85c16f5159aafefa07a39
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.