diff for duplicates of <546084A8.9070601@st.com> diff --git a/a/1.txt b/N1/1.txt index 333ce07..b068d58 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,7 @@ On 11/07/2014 12:57 PM, Peter Griffin wrote: > The stih410 has some additional usb controllers. This patch adds the > dt nodes which will enabled them to function correctly. > -> 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/stih407.dtsi | 60 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 60 insertions(+) @@ -23,7 +23,7 @@ file in it. > "port"; > }; > + -> + ohci0: usb at 9a03c00 { +> + ohci0: usb@9a03c00 { > + compatible = "st,st-ohci-300x"; > + status = "disabled"; > + reg = <0x9a03c00 0x100>; @@ -37,7 +37,7 @@ file in it. > + phy-names = "usb"; > + }; > + -> + ehci0: usb at 9a03e00 { +> + ehci0: usb@9a03e00 { > + compatible = "st,st-ehci-300x"; > + status = "disabled"; > + reg = <0x9a03e00 0x100>; @@ -53,7 +53,7 @@ file in it. > + phy-names = "usb"; > + }; > + -> + ohci1: usb at 9a83c00 { +> + ohci1: usb@9a83c00 { > + compatible = "st,st-ohci-300x"; > + status = "disabled"; > + reg = <0x9a83c00 0x100>; @@ -67,7 +67,7 @@ file in it. > + phy-names = "usb"; > + }; > + -> + ehci1: usb at 9a83e00 { +> + ehci1: usb@9a83e00 { > + compatible = "st,st-ehci-300x"; > + status = "disabled"; > + reg = <0x9a83e00 0x100>; @@ -84,3 +84,8 @@ file in it. > + }; > }; > }; + +-- +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 9b973b0..4f58fd2 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-11-git-send-email-peter.griffin@linaro.org\0" - "From\0maxime.coquelin@st.com (Maxime Coquelin)\0" - "Subject\0[PATCH 10/13] ARM: STi: DT: STih410: Add dt nodes for the ehci / ohci usb controllers.\0" + "ref\01415361475-6218-11-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" + "From\0Maxime Coquelin <maxime.coquelin-qxv4g6HH51o@public.gmane.org>\0" + "Subject\0Re: [PATCH 10/13] ARM: STi: DT: STih410: Add dt nodes for the ehci / ohci usb controllers.\0" "Date\0Mon, 10 Nov 2014 10:26:00 +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" @@ -13,7 +20,7 @@ "> The stih410 has some additional usb controllers. This patch adds the\n" "> dt nodes which will enabled them to function correctly.\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/stih407.dtsi | 60 ++++++++++++++++++++++++++++++++++++++++++\n" "> 1 file changed, 60 insertions(+)\n" @@ -31,7 +38,7 @@ "> \t\t\t\t \"port\";\n" "> \t\t};\n" "> +\n" - "> +\t\tohci0: usb at 9a03c00 {\n" + "> +\t\tohci0: usb@9a03c00 {\n" "> +\t\t\tcompatible = \"st,st-ohci-300x\";\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t\treg = <0x9a03c00 0x100>;\n" @@ -45,7 +52,7 @@ "> +\t\t\tphy-names = \"usb\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tehci0: usb at 9a03e00 {\n" + "> +\t\tehci0: usb@9a03e00 {\n" "> +\t\t\tcompatible = \"st,st-ehci-300x\";\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t\treg = <0x9a03e00 0x100>;\n" @@ -61,7 +68,7 @@ "> +\t\t\tphy-names = \"usb\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tohci1: usb at 9a83c00 {\n" + "> +\t\tohci1: usb@9a83c00 {\n" "> +\t\t\tcompatible = \"st,st-ohci-300x\";\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t\treg = <0x9a83c00 0x100>;\n" @@ -75,7 +82,7 @@ "> +\t\t\tphy-names = \"usb\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tehci1: usb at 9a83e00 {\n" + "> +\t\tehci1: usb@9a83e00 {\n" "> +\t\t\tcompatible = \"st,st-ehci-300x\";\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t\treg = <0x9a83e00 0x100>;\n" @@ -91,6 +98,11 @@ "> +\t\t\tphy-names = \"usb\";\n" "> +\t\t};\n" "> \t};\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 -c4e12878950fb37a20c3cc6bab14a1e8f097e9f0598cc97fc929476bfb7c9750 +fe0c9a656da23c138190ed4265902c9e5cd47b987fba4e1ef7504da3a7f45c2a
diff --git a/a/1.txt b/N2/1.txt index 333ce07..e29a827 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -23,7 +23,7 @@ file in it. > "port"; > }; > + -> + ohci0: usb at 9a03c00 { +> + ohci0: usb@9a03c00 { > + compatible = "st,st-ohci-300x"; > + status = "disabled"; > + reg = <0x9a03c00 0x100>; @@ -37,7 +37,7 @@ file in it. > + phy-names = "usb"; > + }; > + -> + ehci0: usb at 9a03e00 { +> + ehci0: usb@9a03e00 { > + compatible = "st,st-ehci-300x"; > + status = "disabled"; > + reg = <0x9a03e00 0x100>; @@ -53,7 +53,7 @@ file in it. > + phy-names = "usb"; > + }; > + -> + ohci1: usb at 9a83c00 { +> + ohci1: usb@9a83c00 { > + compatible = "st,st-ohci-300x"; > + status = "disabled"; > + reg = <0x9a83c00 0x100>; @@ -67,7 +67,7 @@ file in it. > + phy-names = "usb"; > + }; > + -> + ehci1: usb at 9a83e00 { +> + ehci1: usb@9a83e00 { > + compatible = "st,st-ehci-300x"; > + status = "disabled"; > + reg = <0x9a83e00 0x100>; diff --git a/a/content_digest b/N2/content_digest index 9b973b0..5012227 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-11-git-send-email-peter.griffin@linaro.org\0" - "From\0maxime.coquelin@st.com (Maxime Coquelin)\0" - "Subject\0[PATCH 10/13] ARM: STi: DT: STih410: Add dt nodes for the ehci / ohci usb controllers.\0" + "From\0Maxime Coquelin <maxime.coquelin@st.com>\0" + "Subject\0Re: [PATCH 10/13] ARM: STi: DT: STih410: Add dt nodes for the ehci / ohci usb controllers.\0" "Date\0Mon, 10 Nov 2014 10:26:00 +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" @@ -31,7 +37,7 @@ "> \t\t\t\t \"port\";\n" "> \t\t};\n" "> +\n" - "> +\t\tohci0: usb at 9a03c00 {\n" + "> +\t\tohci0: usb@9a03c00 {\n" "> +\t\t\tcompatible = \"st,st-ohci-300x\";\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t\treg = <0x9a03c00 0x100>;\n" @@ -45,7 +51,7 @@ "> +\t\t\tphy-names = \"usb\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tehci0: usb at 9a03e00 {\n" + "> +\t\tehci0: usb@9a03e00 {\n" "> +\t\t\tcompatible = \"st,st-ehci-300x\";\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t\treg = <0x9a03e00 0x100>;\n" @@ -61,7 +67,7 @@ "> +\t\t\tphy-names = \"usb\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tohci1: usb at 9a83c00 {\n" + "> +\t\tohci1: usb@9a83c00 {\n" "> +\t\t\tcompatible = \"st,st-ohci-300x\";\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t\treg = <0x9a83c00 0x100>;\n" @@ -75,7 +81,7 @@ "> +\t\t\tphy-names = \"usb\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tehci1: usb at 9a83e00 {\n" + "> +\t\tehci1: usb@9a83e00 {\n" "> +\t\t\tcompatible = \"st,st-ehci-300x\";\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t\treg = <0x9a83e00 0x100>;\n" @@ -93,4 +99,4 @@ "> \t};\n" > }; -c4e12878950fb37a20c3cc6bab14a1e8f097e9f0598cc97fc929476bfb7c9750 +ba3178acb425a9c3042b70e6e2a747369136ae8374f8c1e74cb1d0458ecf0b45
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.