diff for duplicates of <20140417113306.545ca4a7@xhacker> diff --git a/a/1.txt b/N1/1.txt index 0eaf722..4e44aab 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,12 +1,12 @@ Hi Antoine, 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. > -> Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> +> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com> > --- > arch/arm/boot/dts/berlin2q.dtsi | 40 > ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) @@ -34,7 +34,7 @@ Antoine Ténart <antoine.tenart@free-electrons.com> wrote: > ranges = <0 0xf7000000 0x1000000>; > interrupt-parent = <&gic>; > -> + sdhci0: sdhci@ab0000 { +> + sdhci0: sdhci at ab0000 { > + compatible = "marvell,berlin2q-sdhci"; > + reg = <0xab0000 0x200>; > + clocks = <&sdio1clk>; @@ -45,7 +45,7 @@ Antoine Ténart <antoine.tenart@free-electrons.com> wrote: > + status = "disabled"; > + }; > + -> + sdhci1: sdhci@ab0800 { +> + sdhci1: sdhci at ab0800 { > + compatible = "marvell,berlin2q-sdhci"; > + reg = <0xab0800 0x200>; > + clocks = <&sdio1clk>; @@ -55,7 +55,7 @@ Antoine Ténart <antoine.tenart@free-electrons.com> 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>; @@ -66,14 +66,14 @@ Antoine Ténart <antoine.tenart@free-electrons.com> 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: -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. -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. I dunno whether there's elegant solutions for these two issues. alias? Could diff --git a/a/content_digest b/N1/content_digest index 78cbee4..87eee59 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,29 +1,20 @@ "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" - "From\0Jisheng Zhang <jszhang@marvell.com>\0" - "Subject\0Re: [PATCH 3/4] ARM: dts: berlin: add the SDHCI nodes for the BG2Q\0" + "From\0jszhang@marvell.com (Jisheng Zhang)\0" + "Subject\0[PATCH 3/4] ARM: dts: berlin: add the SDHCI nodes for the BG2Q\0" "Date\0Thu, 17 Apr 2014 11:33:06 +0800\0" - "To\0Antoine T\303\251nart <antoine.tenart@free-electrons.com>\0" - "Cc\0sebastian.hesselbarth@gmail.com <sebastian.hesselbarth@gmail.com>" - chris@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" "Hi Antoine,\n" "\n" "On Wed, 16 Apr 2014 05:40:10 -0700\n" - "Antoine T\303\251nart <antoine.tenart@free-electrons.com> wrote:\n" + "Antoine T?nart <antoine.tenart@free-electrons.com> wrote:\n" "\n" "> Add the SDHCI nodes for the Marvell Berlin BG2Q, using the berlin-sdhci\n" "> driver.\n" "> \n" - "> Signed-off-by: Antoine T\303\251nart <antoine.tenart@free-electrons.com>\n" + "> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com>\n" "> ---\n" "> arch/arm/boot/dts/berlin2q.dtsi | 40\n" "> ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)\n" @@ -51,7 +42,7 @@ "> \t\tranges = <0 0xf7000000 0x1000000>;\n" "> \t\tinterrupt-parent = <&gic>;\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" @@ -62,7 +53,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" @@ -72,7 +63,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" @@ -83,14 +74,14 @@ "> +\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" - "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" - "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" "I dunno whether there's elegant solutions for these two issues. alias? Could\n" @@ -99,4 +90,4 @@ "Thanks in advance,\n" Jisheng -bf865cd0abb242c65b1ff1fa8c8bc495f450128f093839d74e50d9bcb5ab872b +3d59ff7357e5bb9d6bfc1ce2a310160e54b099dac6fc51ccc3f462856bb6f84b
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.