diff for duplicates of <539ECA8C.4010007@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 9365df5..1bd5fd8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,8 @@ -On 06/16/2014 12:26 PM, Antoine Ténart wrote: +On 06/16/2014 12:26 PM, Antoine T?nart wrote: > The BG2Q has an AHCI SATA controller. Add the corresponding nodes > (AHCI, PHY) into its device tree. > -> 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 | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) @@ -15,7 +15,7 @@ On 06/16/2014 12:26 PM, Antoine Ténart wrote: > clock-names = "refclk"; > }; > -> + ahci: sata@e90000 { +> + ahci: sata at e90000 { > + compatible = "generic-ahci"; > + reg = <0xe90000 0x1000>; > + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; @@ -23,20 +23,20 @@ On 06/16/2014 12:26 PM, Antoine Ténart wrote: > + #address-cells = <1>; > + #size-cells = <0>; > + -> + sata0: sata-port@0 { +> + sata0: sata-port at 0 { > + reg = <0>; > + phys = <&sata_phy 0>; > + status = "disabled"; > + }; > + -> + sata1: sata-port@1 { +> + sata1: sata-port at 1 { > + reg = <1>; > + phys = <&sata_phy 1>; > + status = "disabled"; > + }; > + }; > + -> + sata_phy: phy@e900a0 { +> + sata_phy: phy at e900a0 { > + compatible = "marvell,berlin-sata-phy"; > + reg = <0xe900a0 0x200>; @@ -55,7 +55,7 @@ Sebastian > + status = "disabled"; > + }; > + -> apb@fc0000 { +> apb at fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > diff --git a/a/content_digest b/N1/content_digest index efc4b2d..43348d1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,26 +1,16 @@ "ref\01402914392-6028-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01402914392-6028-7-git-send-email-antoine.tenart@free-electrons.com\0" - "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" - "Subject\0Re: [PATCH v6 6/7] ARM: berlin: add the AHCI node for the BG2Q\0" + "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" + "Subject\0[PATCH v6 6/7] ARM: berlin: add the AHCI node for the BG2Q\0" "Date\0Mon, 16 Jun 2014 12:44:28 +0200\0" - "To\0Antoine T\303\251nart <antoine.tenart@free-electrons.com>" - tj@kernel.org - " kishon@ti.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 - linux-ide@vger.kernel.org - devicetree@vger.kernel.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On 06/16/2014 12:26 PM, Antoine T\303\203\302\251nart wrote:\n" + "On 06/16/2014 12:26 PM, Antoine T?nart wrote:\n" "> The BG2Q has an AHCI SATA controller. Add the corresponding nodes\n" "> (AHCI, PHY) into its device tree.\n" ">\n" - "> Signed-off-by: Antoine T\303\203\302\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 | 28 ++++++++++++++++++++++++++++\n" "> 1 file changed, 28 insertions(+)\n" @@ -33,7 +23,7 @@ "> \t\t\tclock-names = \"refclk\";\n" "> \t\t};\n" ">\n" - "> +\t\tahci: sata@e90000 {\n" + "> +\t\tahci: sata at e90000 {\n" "> +\t\t\tcompatible = \"generic-ahci\";\n" "> +\t\t\treg = <0xe90000 0x1000>;\n" "> +\t\t\tinterrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -41,20 +31,20 @@ "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\t\tsata0: sata-port@0 {\n" + "> +\t\t\tsata0: sata-port at 0 {\n" "> +\t\t\t\treg = <0>;\n" "> +\t\t\t\tphys = <&sata_phy 0>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tsata1: sata-port@1 {\n" + "> +\t\t\tsata1: sata-port at 1 {\n" "> +\t\t\t\treg = <1>;\n" "> +\t\t\t\tphys = <&sata_phy 1>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tsata_phy: phy@e900a0 {\n" + "> +\t\tsata_phy: phy at e900a0 {\n" "> +\t\t\tcompatible = \"marvell,berlin-sata-phy\";\n" "> +\t\t\treg = <0xe900a0 0x200>;\n" "\n" @@ -73,9 +63,9 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tapb@fc0000 {\n" + "> \t\tapb at fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" > -0d914d0bad38767c7040896a3db71bfc911882e1777f6b0c6e874e1dc886e97d +8f0a9173cbee1896be54d45168b1b5f5e8509cae87182074a7f86f7a1b697612
diff --git a/a/1.txt b/N2/1.txt index 9365df5..a90f676 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,8 +1,8 @@ -On 06/16/2014 12:26 PM, Antoine Ténart wrote: +On 06/16/2014 12:26 PM, Antoine Ténart wrote: > The BG2Q has an AHCI SATA controller. Add the corresponding nodes > (AHCI, PHY) into its device tree. > -> 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 | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) diff --git a/a/content_digest b/N2/content_digest index efc4b2d..48155fd 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -16,11 +16,11 @@ " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" - "On 06/16/2014 12:26 PM, Antoine T\303\203\302\251nart wrote:\n" + "On 06/16/2014 12:26 PM, Antoine T\303\251nart wrote:\n" "> The BG2Q has an AHCI SATA controller. Add the corresponding nodes\n" "> (AHCI, PHY) into its device tree.\n" ">\n" - "> Signed-off-by: Antoine T\303\203\302\251nart <antoine.tenart@free-electrons.com>\n" + "> Signed-off-by: Antoine T\303\251nart <antoine.tenart@free-electrons.com>\n" "> ---\n" "> arch/arm/boot/dts/berlin2q.dtsi | 28 ++++++++++++++++++++++++++++\n" "> 1 file changed, 28 insertions(+)\n" @@ -78,4 +78,4 @@ "> \t\t\t#address-cells = <1>;\n" > -0d914d0bad38767c7040896a3db71bfc911882e1777f6b0c6e874e1dc886e97d +2a8f6619ee9604b7cb794062903c061bccacfe3b0c0573a142b669a2be7bec76
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.