diff for duplicates of <54608367.6010901@st.com> diff --git a/a/1.txt b/N1/1.txt index 35a3801..bee2472 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ On 11/07/2014 12:57 PM, Peter Griffin wrote: > > It has wide connectivity including USB 3.0, PCI-e, SATA and gigabit ethernet. > -> Signed-off-by: Peter Griffin <peter.griffin@linaro.org> +> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> > --- > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/stih410-b2120.dts | 42 +++++ @@ -38,7 +38,7 @@ Please fix the commit title. > @@ -0,0 +1,42 @@ > +/* > + * Copyright (C) 2014 STMicroelectronics (R&D) Limited. -> + * Author: Peter Griffin <peter.griffin@linaro.org> +> + * Author: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as @@ -62,22 +62,26 @@ This file should be included by a SoC dtsi file, not a board file, no? > + > + soc { > + -> + ohci0: usb at 9a03c00 { +> + ohci0: usb@9a03c00 { > + status = "okay"; > + }; > + -> + ehci0: usb at 9a03e00 { +> + ehci0: usb@9a03e00 { > + status = "okay"; > + }; > + -> + ohci1: usb at 9a83c00 { +> + ohci1: usb@9a83c00 { > + status = "okay"; > + }; > + -> + ehci1: usb at 9a83e00 { +> + ehci1: usb@9a83e00 { > + status = "okay"; > + }; > + }; > +}; > <snip> +-- +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 b487fbe..1e88881 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,16 @@ "ref\01415361475-6218-1-git-send-email-peter.griffin@linaro.org\0" "ref\01415361475-6218-13-git-send-email-peter.griffin@linaro.org\0" - "From\0maxime.coquelin@st.com (Maxime Coquelin)\0" - "Subject\0[PATCH 12/13] ARM: STi: DT: STiH410: Add STiH410 SoC clock support.\0" + "ref\01415361475-6218-13-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" + "From\0Maxime Coquelin <maxime.coquelin-qxv4g6HH51o@public.gmane.org>\0" + "Subject\0Re: [PATCH 12/13] ARM: STi: DT: STiH410: Add STiH410 SoC clock support.\0" "Date\0Mon, 10 Nov 2014 10:20:39 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + srinivas.kandagatla-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org + " patrice.chotard-qxv4g6HH51o@public.gmane.org\0" + "Cc\0lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org" + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "Hi Peter,\n" @@ -14,7 +21,7 @@ ">\n" "> It has wide connectivity including USB 3.0, PCI-e, SATA and gigabit ethernet.\n" ">\n" - "> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>\n" + "> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/Makefile | 1 +\n" "> arch/arm/boot/dts/stih410-b2120.dts | 42 +++++\n" @@ -46,7 +53,7 @@ "> @@ -0,0 +1,42 @@\n" "> +/*\n" "> + * Copyright (C) 2014 STMicroelectronics (R&D) Limited.\n" - "> + * Author: Peter Griffin <peter.griffin@linaro.org>\n" + "> + * Author: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" "> + *\n" "> + * This program is free software; you can redistribute it and/or modify\n" "> + * it under the terms of the GNU General Public License version 2 as\n" @@ -70,24 +77,28 @@ "> +\n" "> +\tsoc {\n" "> +\n" - "> +\t\tohci0: usb at 9a03c00 {\n" + "> +\t\tohci0: usb@9a03c00 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tehci0: usb at 9a03e00 {\n" + "> +\t\tehci0: usb@9a03e00 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tohci1: usb at 9a83c00 {\n" + "> +\t\tohci1: usb@9a83c00 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tehci1: usb at 9a83e00 {\n" + "> +\t\tehci1: usb@9a83e00 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\t};\n" "> +};\n" ">\n" - <snip> + "<snip>\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 -910321133f2547184b77311cf8594f699829d2e161368f65552370ecb01d7033 +7ecd022b136e7228ceb549b2d0db04b4c56a0165096765a9c615675929642518
diff --git a/a/1.txt b/N2/1.txt index 35a3801..3c5f839 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -62,19 +62,19 @@ This file should be included by a SoC dtsi file, not a board file, no? > + > + soc { > + -> + ohci0: usb at 9a03c00 { +> + ohci0: usb@9a03c00 { > + status = "okay"; > + }; > + -> + ehci0: usb at 9a03e00 { +> + ehci0: usb@9a03e00 { > + status = "okay"; > + }; > + -> + ohci1: usb at 9a83c00 { +> + ohci1: usb@9a83c00 { > + status = "okay"; > + }; > + -> + ehci1: usb at 9a83e00 { +> + ehci1: usb@9a83e00 { > + status = "okay"; > + }; > + }; diff --git a/a/content_digest b/N2/content_digest index b487fbe..09bebd9 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,15 @@ "ref\01415361475-6218-1-git-send-email-peter.griffin@linaro.org\0" "ref\01415361475-6218-13-git-send-email-peter.griffin@linaro.org\0" - "From\0maxime.coquelin@st.com (Maxime Coquelin)\0" - "Subject\0[PATCH 12/13] ARM: STi: DT: STiH410: Add STiH410 SoC clock support.\0" + "From\0Maxime Coquelin <maxime.coquelin@st.com>\0" + "Subject\0Re: [PATCH 12/13] ARM: STi: DT: STiH410: Add STiH410 SoC clock support.\0" "Date\0Mon, 10 Nov 2014 10:20:39 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Peter Griffin <peter.griffin@linaro.org>" + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + <srinivas.kandagatla@gmail.com> + " <patrice.chotard@st.com>\0" + "Cc\0<lee.jones@linaro.org>" + " <devicetree@vger.kernel.org>\0" "\00:1\0" "b\0" "Hi Peter,\n" @@ -70,19 +76,19 @@ "> +\n" "> +\tsoc {\n" "> +\n" - "> +\t\tohci0: usb at 9a03c00 {\n" + "> +\t\tohci0: usb@9a03c00 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tehci0: usb at 9a03e00 {\n" + "> +\t\tehci0: usb@9a03e00 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tohci1: usb at 9a83c00 {\n" + "> +\t\tohci1: usb@9a83c00 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tehci1: usb at 9a83e00 {\n" + "> +\t\tehci1: usb@9a83e00 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\t};\n" @@ -90,4 +96,4 @@ ">\n" <snip> -910321133f2547184b77311cf8594f699829d2e161368f65552370ecb01d7033 +9fd40120ab01f0af48e70743c75dfab583d9eb53ea3cf9c38270e74e242a4ceb
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.