diff for duplicates of <546BA01A.6050707@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 2945177..ea999d1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,12 +1,12 @@ On 17.11.2014 14:35, Antoine Tenart wrote: -> From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> +> From: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > > Adds nodes describing the Marvell Berlin BG2CD USB PHY and USB. The BG2CD > SoC has 2 USB ChipIdea controllers, with usb0 host-only and usb1 dual-role > capable. > -> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> -> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> +> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +> Signed-off-by: Antoine Tenart <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Applied to berlin/dt with usb-phy nodes reordered correctly (ethernet nodes came in between in the meantime). @@ -25,7 +25,7 @@ Thanks! > clocks = <&chip CLKID_TWD>; > }; > -> + usb_phy0: usb-phy at b74000 { +> + usb_phy0: usb-phy@b74000 { > + compatible = "marvell,berlin2cd-usb-phy"; > + reg = <0xb74000 0x128>; > + #phy-cells = <0>; @@ -33,7 +33,7 @@ Thanks! > + status = "disabled"; > + }; > + -> + usb_phy1: usb-phy at b78000 { +> + usb_phy1: usb-phy@b78000 { > + compatible = "marvell,berlin2cd-usb-phy"; > + reg = <0xb78000 0x128>; > + #phy-cells = <0>; @@ -41,14 +41,14 @@ Thanks! > + status = "disabled"; > + }; > + -> apb at e80000 { +> apb@e80000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -242,6 +258,26 @@ > }; > }; > -> + usb0: usb at ed0000 { +> + usb0: usb@ed0000 { > + compatible = "chipidea,usb2"; > + reg = <0xed0000 0x200>; > + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; @@ -58,7 +58,7 @@ Thanks! > + status = "disabled"; > + }; > + -> + usb1: usb at ee0000 { +> + usb1: usb@ee0000 { > + compatible = "chipidea,usb2"; > + reg = <0xee0000 0x200>; > + interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; @@ -68,7 +68,12 @@ Thanks! > + status = "disabled"; > + }; > + -> apb at fc0000 { +> apb@fc0000 { > compatible = "simple-bus"; > #address-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 5c1f876..28ae351 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,33 @@ "ref\01416231347-27193-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01416231347-27193-13-git-send-email-antoine.tenart@free-electrons.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH v8 12/13] ARM: dts: berlin: add BG2CD nodes for USB support\0" + "ref\01416231347-27193-13-git-send-email-antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH v8 12/13] ARM: dts: berlin: add BG2CD nodes for USB support\0" "Date\0Tue, 18 Nov 2014 20:38:02 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Antoine Tenart <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>" + Peter.Chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org + balbi-l0cyMroinI0@public.gmane.org + " p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org\0" + "Cc\0alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org" + thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org + zmxu-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org + jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org + michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On 17.11.2014 14:35, Antoine Tenart wrote:\n" - "> From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\n" + "> From: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" ">\n" "> Adds nodes describing the Marvell Berlin BG2CD USB PHY and USB. The BG2CD\n" "> SoC has 2 USB ChipIdea controllers, with usb0 host-only and usb1 dual-role\n" "> capable.\n" ">\n" - "> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\n" - "> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>\n" + "> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + "> Signed-off-by: Antoine Tenart <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "\n" "Applied to berlin/dt with usb-phy nodes reordered correctly (ethernet\n" "nodes came in between in the meantime).\n" @@ -33,7 +46,7 @@ "> \t\t\tclocks = <&chip CLKID_TWD>;\n" "> \t\t};\n" ">\n" - "> +\t\tusb_phy0: usb-phy at b74000 {\n" + "> +\t\tusb_phy0: usb-phy@b74000 {\n" "> +\t\t\tcompatible = \"marvell,berlin2cd-usb-phy\";\n" "> +\t\t\treg = <0xb74000 0x128>;\n" "> +\t\t\t#phy-cells = <0>;\n" @@ -41,7 +54,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tusb_phy1: usb-phy at b78000 {\n" + "> +\t\tusb_phy1: usb-phy@b78000 {\n" "> +\t\t\tcompatible = \"marvell,berlin2cd-usb-phy\";\n" "> +\t\t\treg = <0xb78000 0x128>;\n" "> +\t\t\t#phy-cells = <0>;\n" @@ -49,14 +62,14 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at e80000 {\n" + "> \t\tapb@e80000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> @@ -242,6 +258,26 @@\n" "> \t\t\t};\n" "> \t\t};\n" ">\n" - "> +\t\tusb0: usb at ed0000 {\n" + "> +\t\tusb0: usb@ed0000 {\n" "> +\t\t\tcompatible = \"chipidea,usb2\";\n" "> +\t\t\treg = <0xed0000 0x200>;\n" "> +\t\t\tinterrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -66,7 +79,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tusb1: usb at ee0000 {\n" + "> +\t\tusb1: usb@ee0000 {\n" "> +\t\t\tcompatible = \"chipidea,usb2\";\n" "> +\t\t\treg = <0xee0000 0x200>;\n" "> +\t\t\tinterrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -76,9 +89,14 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-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 -2c73fa1d04d9e3bba6dcaa65c9752694c3504d01b27200fd97833441bc89bfc4 +5995a51c02256df4fc2497ab7aca0d6ac5c6b30124b835505e58b0fc888063e4
diff --git a/a/1.txt b/N2/1.txt index 2945177..eb19b19 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -25,7 +25,7 @@ Thanks! > clocks = <&chip CLKID_TWD>; > }; > -> + usb_phy0: usb-phy at b74000 { +> + usb_phy0: usb-phy@b74000 { > + compatible = "marvell,berlin2cd-usb-phy"; > + reg = <0xb74000 0x128>; > + #phy-cells = <0>; @@ -33,7 +33,7 @@ Thanks! > + status = "disabled"; > + }; > + -> + usb_phy1: usb-phy at b78000 { +> + usb_phy1: usb-phy@b78000 { > + compatible = "marvell,berlin2cd-usb-phy"; > + reg = <0xb78000 0x128>; > + #phy-cells = <0>; @@ -41,14 +41,14 @@ Thanks! > + status = "disabled"; > + }; > + -> apb at e80000 { +> apb@e80000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -242,6 +258,26 @@ > }; > }; > -> + usb0: usb at ed0000 { +> + usb0: usb@ed0000 { > + compatible = "chipidea,usb2"; > + reg = <0xed0000 0x200>; > + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; @@ -58,7 +58,7 @@ Thanks! > + status = "disabled"; > + }; > + -> + usb1: usb at ee0000 { +> + usb1: usb@ee0000 { > + compatible = "chipidea,usb2"; > + reg = <0xee0000 0x200>; > + interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; @@ -68,7 +68,7 @@ Thanks! > + status = "disabled"; > + }; > + -> apb at fc0000 { +> apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > diff --git a/a/content_digest b/N2/content_digest index 5c1f876..69e05d7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,21 @@ "ref\01416231347-27193-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01416231347-27193-13-git-send-email-antoine.tenart@free-electrons.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH v8 12/13] ARM: dts: berlin: add BG2CD nodes for USB support\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH v8 12/13] ARM: dts: berlin: add BG2CD nodes for USB support\0" "Date\0Tue, 18 Nov 2014 20:38:02 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Antoine Tenart <antoine.tenart@free-electrons.com>" + Peter.Chen@freescale.com + balbi@ti.com + " p.zabel@pengutronix.de\0" + "Cc\0alexandre.belloni@free-electrons.com" + thomas.petazzoni@free-electrons.com + zmxu@marvell.com + jszhang@marvell.com + michal.simek@xilinx.com + linux-arm-kernel@lists.infradead.org + linux-usb@vger.kernel.org + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 17.11.2014 14:35, Antoine Tenart wrote:\n" @@ -33,7 +45,7 @@ "> \t\t\tclocks = <&chip CLKID_TWD>;\n" "> \t\t};\n" ">\n" - "> +\t\tusb_phy0: usb-phy at b74000 {\n" + "> +\t\tusb_phy0: usb-phy@b74000 {\n" "> +\t\t\tcompatible = \"marvell,berlin2cd-usb-phy\";\n" "> +\t\t\treg = <0xb74000 0x128>;\n" "> +\t\t\t#phy-cells = <0>;\n" @@ -41,7 +53,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tusb_phy1: usb-phy at b78000 {\n" + "> +\t\tusb_phy1: usb-phy@b78000 {\n" "> +\t\t\tcompatible = \"marvell,berlin2cd-usb-phy\";\n" "> +\t\t\treg = <0xb78000 0x128>;\n" "> +\t\t\t#phy-cells = <0>;\n" @@ -49,14 +61,14 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at e80000 {\n" + "> \t\tapb@e80000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> @@ -242,6 +258,26 @@\n" "> \t\t\t};\n" "> \t\t};\n" ">\n" - "> +\t\tusb0: usb at ed0000 {\n" + "> +\t\tusb0: usb@ed0000 {\n" "> +\t\t\tcompatible = \"chipidea,usb2\";\n" "> +\t\t\treg = <0xed0000 0x200>;\n" "> +\t\t\tinterrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -66,7 +78,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tusb1: usb at ee0000 {\n" + "> +\t\tusb1: usb@ee0000 {\n" "> +\t\t\tcompatible = \"chipidea,usb2\";\n" "> +\t\t\treg = <0xee0000 0x200>;\n" "> +\t\t\tinterrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -76,9 +88,9 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" > -2c73fa1d04d9e3bba6dcaa65c9752694c3504d01b27200fd97833441bc89bfc4 +679287ca07bc321f033f5212cacb6464b041b8def5b1012ef975674afe709939
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.