diff for duplicates of <5356A4F4.6090107@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 3301124..2d6c131 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,8 @@ -On 04/22/2014 05:38 PM, Antoine Ténart wrote: +On 04/22/2014 05:38 PM, Antoine T?nart wrote: > Add support for the Berlin SoCs AHCI SATA controller allowing to > interface with devices like external hard drives. > -> Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> +> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com> > --- > drivers/ata/Kconfig | 9 +++ > drivers/ata/Makefile | 1 + @@ -53,7 +53,7 @@ On 04/22/2014 05:38 PM, Antoine Ténart wrote: > + * > + * Copyright (C) 2014 Marvell Technology Group Ltd. > + * -> + * Antoine Ténart <antoine.tenart@free-electrons.com> +> + * Antoine T?nart <antoine.tenart@free-electrons.com> > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any @@ -202,19 +202,19 @@ marvell,force-port-map is undocumented and its name does not reflect what it is about. Before you just rename it to marvell,nr-ports or something, how about having one sub-node per port: -sata_phy0: sata-phy@e90100 { +sata_phy0: sata-phy at e90100 { compatible = "marvell,berlin-sata-phy"; reg = <0xe90100 0x80>; status = "disabled"; }; -sata_phy1: sata-phy@e90180 { +sata_phy1: sata-phy at e90180 { compatible = "marvell,berlin-sata-phy"; reg = <0xe90180 0x80>; status = "disabled"; }; -ahci: sata@e90000 { +ahci: sata at e90000 { compatible = "marvell,berlin-ahci"; reg = <0xe90000 0x100>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; @@ -222,13 +222,13 @@ ahci: sata@e90000 { #size-cells = <0>; status = "disabled"; - sata-port@0 { + sata-port at 0 { reg = <0>; sata-phy = <&sata_phy0>; status = "disabled"; }; - sata-port@1 { + sata-port at 1 { reg = <1>; sata-phy = <&sata_phy1>; status = "okay"; @@ -280,6 +280,6 @@ Sebastian > +module_platform_driver(ahci_berlin_driver); > + > +MODULE_DESCRIPTION("Marvell Berlin AHCI SATA driver"); -> +MODULE_AUTHOR("Antoine Ténart <antoine.tenart@free-electrons.com>"); +> +MODULE_AUTHOR("Antoine T?nart <antoine.tenart@free-electrons.com>"); > +MODULE_LICENSE("GPL"); > diff --git a/a/content_digest b/N1/content_digest index ff457aa..89b24c3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,16 @@ "ref\01398181105-19714-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01398181105-19714-2-git-send-email-antoine.tenart@free-electrons.com\0" - "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" - "Subject\0Re: [PATCH 1/6] ata: ahci: add AHCI support for Berlin SoCs\0" + "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" + "Subject\0[PATCH 1/6] ata: ahci: add AHCI support for Berlin SoCs\0" "Date\0Tue, 22 Apr 2014 19:20:52 +0200\0" - "To\0Antoine T\303\251nart <antoine.tenart@free-electrons.com>" - " tj@kernel.org\0" - "Cc\0alexandre.belloni@free-electrons.com" - zmxu@marvell.com - jszhang@marvell.com - linux-arm-kernel@lists.infradead.org - linux-ide@vger.kernel.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On 04/22/2014 05:38 PM, Antoine T\303\203\302\251nart wrote:\n" + "On 04/22/2014 05:38 PM, Antoine T?nart wrote:\n" "> Add support for the Berlin SoCs AHCI SATA controller allowing to\n" "> interface with devices like external hard drives.\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" "> drivers/ata/Kconfig | 9 +++\n" "> drivers/ata/Makefile | 1 +\n" @@ -68,7 +61,7 @@ "> + *\n" "> + * Copyright (C) 2014 Marvell Technology Group Ltd.\n" "> + *\n" - "> + * Antoine T\303\203\302\251nart <antoine.tenart@free-electrons.com>\n" + "> + * Antoine T?nart <antoine.tenart@free-electrons.com>\n" "> + *\n" "> + * This file is licensed under the terms of the GNU General Public\n" "> + * License version 2. This program is licensed \"as is\" without any\n" @@ -217,19 +210,19 @@ "what it is about. Before you just rename it to marvell,nr-ports or\n" "something, how about having one sub-node per port:\n" "\n" - "sata_phy0: sata-phy@e90100 {\n" + "sata_phy0: sata-phy at e90100 {\n" "\tcompatible = \"marvell,berlin-sata-phy\";\n" "\treg = <0xe90100 0x80>;\n" "\tstatus = \"disabled\";\n" "};\n" "\n" - "sata_phy1: sata-phy@e90180 {\n" + "sata_phy1: sata-phy at e90180 {\n" "\tcompatible = \"marvell,berlin-sata-phy\";\n" "\treg = <0xe90180 0x80>;\n" "\tstatus = \"disabled\";\n" "};\n" "\n" - "ahci: sata@e90000 {\n" + "ahci: sata at e90000 {\n" "\tcompatible = \"marvell,berlin-ahci\";\n" "\treg = <0xe90000 0x100>;\n" "\tinterrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -237,13 +230,13 @@ "\t#size-cells = <0>;\n" "\tstatus = \"disabled\";\n" "\n" - "\tsata-port@0 {\n" + "\tsata-port at 0 {\n" "\t\treg = <0>;\n" "\t\tsata-phy = <&sata_phy0>;\n" "\t\tstatus = \"disabled\";\n" "\t};\n" "\n" - "\tsata-port@1 {\n" + "\tsata-port at 1 {\n" "\t\treg = <1>;\n" "\t\tsata-phy = <&sata_phy1>;\n" "\t\tstatus = \"okay\";\n" @@ -295,8 +288,8 @@ "> +module_platform_driver(ahci_berlin_driver);\n" "> +\n" "> +MODULE_DESCRIPTION(\"Marvell Berlin AHCI SATA driver\");\n" - "> +MODULE_AUTHOR(\"Antoine T\303\203\302\251nart <antoine.tenart@free-electrons.com>\");\n" + "> +MODULE_AUTHOR(\"Antoine T?nart <antoine.tenart@free-electrons.com>\");\n" "> +MODULE_LICENSE(\"GPL\");\n" > -d20b58019350257ac65cae76e5194ebc8ba6ff9f8dbeb00787798e4b3c0f8e43 +68c064980929158faaf339d27c62cfd4097e68ed438bbfe6c462b27b7fadaeab
diff --git a/a/1.txt b/N2/1.txt index 3301124..5ef45e2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,8 +1,8 @@ -On 04/22/2014 05:38 PM, Antoine Ténart wrote: +On 04/22/2014 05:38 PM, Antoine Ténart wrote: > Add support for the Berlin SoCs AHCI SATA controller allowing to > interface with devices like external hard drives. > -> Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> +> Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> > --- > drivers/ata/Kconfig | 9 +++ > drivers/ata/Makefile | 1 + @@ -53,7 +53,7 @@ On 04/22/2014 05:38 PM, Antoine Ténart wrote: > + * > + * Copyright (C) 2014 Marvell Technology Group Ltd. > + * -> + * Antoine Ténart <antoine.tenart@free-electrons.com> +> + * Antoine Ténart <antoine.tenart@free-electrons.com> > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any @@ -280,6 +280,6 @@ Sebastian > +module_platform_driver(ahci_berlin_driver); > + > +MODULE_DESCRIPTION("Marvell Berlin AHCI SATA driver"); -> +MODULE_AUTHOR("Antoine Ténart <antoine.tenart@free-electrons.com>"); +> +MODULE_AUTHOR("Antoine Ténart <antoine.tenart@free-electrons.com>"); > +MODULE_LICENSE("GPL"); > diff --git a/a/content_digest b/N2/content_digest index ff457aa..13e75a7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -13,11 +13,11 @@ " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" - "On 04/22/2014 05:38 PM, Antoine T\303\203\302\251nart wrote:\n" + "On 04/22/2014 05:38 PM, Antoine T\303\251nart wrote:\n" "> Add support for the Berlin SoCs AHCI SATA controller allowing to\n" "> interface with devices like external hard drives.\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" "> drivers/ata/Kconfig | 9 +++\n" "> drivers/ata/Makefile | 1 +\n" @@ -68,7 +68,7 @@ "> + *\n" "> + * Copyright (C) 2014 Marvell Technology Group Ltd.\n" "> + *\n" - "> + * Antoine T\303\203\302\251nart <antoine.tenart@free-electrons.com>\n" + "> + * Antoine T\303\251nart <antoine.tenart@free-electrons.com>\n" "> + *\n" "> + * This file is licensed under the terms of the GNU General Public\n" "> + * License version 2. This program is licensed \"as is\" without any\n" @@ -295,8 +295,8 @@ "> +module_platform_driver(ahci_berlin_driver);\n" "> +\n" "> +MODULE_DESCRIPTION(\"Marvell Berlin AHCI SATA driver\");\n" - "> +MODULE_AUTHOR(\"Antoine T\303\203\302\251nart <antoine.tenart@free-electrons.com>\");\n" + "> +MODULE_AUTHOR(\"Antoine T\303\251nart <antoine.tenart@free-electrons.com>\");\n" "> +MODULE_LICENSE(\"GPL\");\n" > -d20b58019350257ac65cae76e5194ebc8ba6ff9f8dbeb00787798e4b3c0f8e43 +d8605bb64490c4759a20c7400d3f9a58f960ef4ad12c7f7654b90f90ec536577
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.