diff for duplicates of <54629A5B.9050209@gmail.com> diff --git a/a/1.txt b/N1/1.txt index f5cb333..55bd0e0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,8 +2,8 @@ On 30.10.2014 11:21, Sebastian Hesselbarth wrote: > Add DT nodes for the AHCI controller and SATA PHY found on Marvell > Berlin2 SoCs. > -> Acked-by: Antoine T?nart <antoine.tenart@free-electrons.com> -> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> +> Acked-by: Antoine Ténart <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> +> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Applied both DT patches to berlin/dt. @@ -21,7 +21,7 @@ Sebastian > }; > }; > -> + ahci: sata at e90000 { +> + ahci: sata@e90000 { > + compatible = "marvell,berlin2-ahci", "generic-ahci"; > + reg = <0xe90000 0x1000>; > + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; @@ -29,20 +29,20 @@ Sebastian > + #address-cells = <1>; > + #size-cells = <0>; > + -> + sata0: sata-port at 0 { +> + sata0: sata-port@0 { > + reg = <0>; > + phys = <&sata_phy 0>; > + status = "disabled"; > + }; > + -> + sata1: sata-port at 1 { +> + sata1: sata-port@1 { > + reg = <1>; > + phys = <&sata_phy 1>; > + status = "disabled"; > + }; > + }; > + -> + sata_phy: phy at e900a0 { +> + sata_phy: phy@e900a0 { > + compatible = "marvell,berlin2-sata-phy"; > + reg = <0xe900a0 0x200>; > + clocks = <&chip CLKID_SATA>; @@ -51,16 +51,21 @@ Sebastian > + #phy-cells = <1>; > + status = "disabled"; > + -> + sata-phy at 0 { +> + sata-phy@0 { > + reg = <0>; > + }; > + -> + sata-phy at 1 { +> + sata-phy@1 { > + reg = <1>; > + }; > + }; > + -> chip: chip-control at ea0000 { +> chip: chip-control@ea0000 { > compatible = "marvell,berlin2-chip-ctrl"; > #clock-cells = <1>; > + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 91671e5..8168cef 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,23 @@ "ref\01413882477-27922-1-git-send-email-sebastian.hesselbarth@gmail.com\0" "ref\01414664488-5911-1-git-send-email-sebastian.hesselbarth@gmail.com\0" "ref\01414664488-5911-5-git-send-email-sebastian.hesselbarth@gmail.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH v3 4/5] ARM: berlin: Add AHCI and SATA PHY nodes to BG2\0" + "ref\01414664488-5911-5-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH v3 4/5] ARM: berlin: Add AHCI and SATA PHY nodes to BG2\0" "Date\0Wed, 12 Nov 2014 00:23:07 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Cc\0Kishon Vijay Abraham I <kishon-l0cyMroinI0@public.gmane.org>" + " Antoine T\303\251nart <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On 30.10.2014 11:21, Sebastian Hesselbarth wrote:\n" "> Add DT nodes for the AHCI controller and SATA PHY found on Marvell\n" "> Berlin2 SoCs.\n" ">\n" - "> Acked-by: Antoine T?nart <antoine.tenart@free-electrons.com>\n" - "> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\n" + "> Acked-by: Antoine T\303\203\302\251nart <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" + "> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "\n" "Applied both DT patches to berlin/dt.\n" "\n" @@ -30,7 +35,7 @@ "> \t\t\t};\n" "> \t\t};\n" ">\n" - "> +\t\tahci: sata at e90000 {\n" + "> +\t\tahci: sata@e90000 {\n" "> +\t\t\tcompatible = \"marvell,berlin2-ahci\", \"generic-ahci\";\n" "> +\t\t\treg = <0xe90000 0x1000>;\n" "> +\t\t\tinterrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -38,20 +43,20 @@ "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\t\tsata0: sata-port at 0 {\n" + "> +\t\t\tsata0: sata-port@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 at 1 {\n" + "> +\t\t\tsata1: sata-port@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 at e900a0 {\n" + "> +\t\tsata_phy: phy@e900a0 {\n" "> +\t\t\tcompatible = \"marvell,berlin2-sata-phy\";\n" "> +\t\t\treg = <0xe900a0 0x200>;\n" "> +\t\t\tclocks = <&chip CLKID_SATA>;\n" @@ -60,18 +65,23 @@ "> +\t\t\t#phy-cells = <1>;\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\n" - "> +\t\t\tsata-phy at 0 {\n" + "> +\t\t\tsata-phy@0 {\n" "> +\t\t\t\treg = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tsata-phy at 1 {\n" + "> +\t\t\tsata-phy@1 {\n" "> +\t\t\t\treg = <1>;\n" "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\tchip: chip-control at ea0000 {\n" + "> \t\tchip: chip-control@ea0000 {\n" "> \t\t\tcompatible = \"marvell,berlin2-chip-ctrl\";\n" "> \t\t\t#clock-cells = <1>;\n" - > + ">\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -89000bf1916716bd0f5de718785d2bbe4acc7e0cc1383de6fdd6204d4a358c31 +fd754edeec8b3787d1aa6d24ea6e92c11548d8f92955ec4f237572db580c82d5
diff --git a/a/1.txt b/N2/1.txt index f5cb333..c4d312e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,7 +2,7 @@ On 30.10.2014 11:21, Sebastian Hesselbarth wrote: > Add DT nodes for the AHCI controller and SATA PHY found on Marvell > Berlin2 SoCs. > -> Acked-by: Antoine T?nart <antoine.tenart@free-electrons.com> +> Acked-by: Antoine Ténart <antoine.tenart@free-electrons.com> > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Applied both DT patches to berlin/dt. @@ -21,7 +21,7 @@ Sebastian > }; > }; > -> + ahci: sata at e90000 { +> + ahci: sata@e90000 { > + compatible = "marvell,berlin2-ahci", "generic-ahci"; > + reg = <0xe90000 0x1000>; > + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; @@ -29,20 +29,20 @@ Sebastian > + #address-cells = <1>; > + #size-cells = <0>; > + -> + sata0: sata-port at 0 { +> + sata0: sata-port@0 { > + reg = <0>; > + phys = <&sata_phy 0>; > + status = "disabled"; > + }; > + -> + sata1: sata-port at 1 { +> + sata1: sata-port@1 { > + reg = <1>; > + phys = <&sata_phy 1>; > + status = "disabled"; > + }; > + }; > + -> + sata_phy: phy at e900a0 { +> + sata_phy: phy@e900a0 { > + compatible = "marvell,berlin2-sata-phy"; > + reg = <0xe900a0 0x200>; > + clocks = <&chip CLKID_SATA>; @@ -51,16 +51,16 @@ Sebastian > + #phy-cells = <1>; > + status = "disabled"; > + -> + sata-phy at 0 { +> + sata-phy@0 { > + reg = <0>; > + }; > + -> + sata-phy at 1 { +> + sata-phy@1 { > + reg = <1>; > + }; > + }; > + -> chip: chip-control at ea0000 { +> chip: chip-control@ea0000 { > compatible = "marvell,berlin2-chip-ctrl"; > #clock-cells = <1>; > diff --git a/a/content_digest b/N2/content_digest index 91671e5..2e4aa79 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,17 +1,22 @@ "ref\01413882477-27922-1-git-send-email-sebastian.hesselbarth@gmail.com\0" "ref\01414664488-5911-1-git-send-email-sebastian.hesselbarth@gmail.com\0" "ref\01414664488-5911-5-git-send-email-sebastian.hesselbarth@gmail.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH v3 4/5] ARM: berlin: Add AHCI and SATA PHY nodes to BG2\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH v3 4/5] ARM: berlin: Add AHCI and SATA PHY nodes to BG2\0" "Date\0Wed, 12 Nov 2014 00:23:07 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0unlisted-recipients:; (no To-header on input)\0" + "Cc\0Kishon Vijay Abraham I <kishon@ti.com>" + " Antoine T\303\251nart <antoine.tenart@free-electrons.com>" + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 30.10.2014 11:21, Sebastian Hesselbarth wrote:\n" "> Add DT nodes for the AHCI controller and SATA PHY found on Marvell\n" "> Berlin2 SoCs.\n" ">\n" - "> Acked-by: Antoine T?nart <antoine.tenart@free-electrons.com>\n" + "> Acked-by: Antoine T\303\251nart <antoine.tenart@free-electrons.com>\n" "> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\n" "\n" "Applied both DT patches to berlin/dt.\n" @@ -30,7 +35,7 @@ "> \t\t\t};\n" "> \t\t};\n" ">\n" - "> +\t\tahci: sata at e90000 {\n" + "> +\t\tahci: sata@e90000 {\n" "> +\t\t\tcompatible = \"marvell,berlin2-ahci\", \"generic-ahci\";\n" "> +\t\t\treg = <0xe90000 0x1000>;\n" "> +\t\t\tinterrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -38,20 +43,20 @@ "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\t\tsata0: sata-port at 0 {\n" + "> +\t\t\tsata0: sata-port@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 at 1 {\n" + "> +\t\t\tsata1: sata-port@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 at e900a0 {\n" + "> +\t\tsata_phy: phy@e900a0 {\n" "> +\t\t\tcompatible = \"marvell,berlin2-sata-phy\";\n" "> +\t\t\treg = <0xe900a0 0x200>;\n" "> +\t\t\tclocks = <&chip CLKID_SATA>;\n" @@ -60,18 +65,18 @@ "> +\t\t\t#phy-cells = <1>;\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\n" - "> +\t\t\tsata-phy at 0 {\n" + "> +\t\t\tsata-phy@0 {\n" "> +\t\t\t\treg = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tsata-phy at 1 {\n" + "> +\t\t\tsata-phy@1 {\n" "> +\t\t\t\treg = <1>;\n" "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\tchip: chip-control at ea0000 {\n" + "> \t\tchip: chip-control@ea0000 {\n" "> \t\t\tcompatible = \"marvell,berlin2-chip-ctrl\";\n" "> \t\t\t#clock-cells = <1>;\n" > -89000bf1916716bd0f5de718785d2bbe4acc7e0cc1383de6fdd6204d4a358c31 +107769b31b3c6ed9625a83f7759e5e3bf70fe94ce5ab7fc0dfe0c6be62b46230
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.