diff for duplicates of <55C0743E.1090406@xilinx.com> diff --git a/a/1.txt b/N1/1.txt index 3a17eda..1b098c7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ On 07/31/2015 03:13 AM, Moritz Fischer wrote: -> Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com> +> Signed-off-by: Moritz Fischer <moritz.fischer-+aYTwkv1SeIAvxtiuMwx3w@public.gmane.org> > --- > arch/arm/boot/dts/zynq-7000.dtsi | 8 ++++++++ > 1 file changed, 8 insertions(+) @@ -19,19 +19,23 @@ On 07/31/2015 03:13 AM, Moritz Fischer wrote: > reg = <0x100 0x100>; > }; > -> + rstc: rstc at 200 { +> + rstc: rstc@200 { > + compatible = "xlnx,zynq-reset"; > + reg = <0x200 0x48>; > + #reset-cells = <1>; > + syscon = <&slcr>; > + }; > + -> pinctrl0: pinctrl at 700 { +> pinctrl0: pinctrl@700 { > compatible = "xlnx,pinctrl-zynq"; > reg = <0x700 0x200>; > -Acked-by: Michal Simek <michal.simek@xilinx.com> +Acked-by: Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org> Thanks, Michal +-- +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 fd4714b..ad38686 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,26 @@ "ref\01438305237-18497-1-git-send-email-moritz.fischer@ettus.com\0" "ref\01438305237-18497-3-git-send-email-moritz.fischer@ettus.com\0" - "From\0michal.simek@xilinx.com (Michal Simek)\0" - "Subject\0[RFCv3 2/4] dts: zynq: Add devicetree entry for Xilinx Zynq reset controller.\0" + "ref\01438305237-18497-3-git-send-email-moritz.fischer-+aYTwkv1SeIAvxtiuMwx3w@public.gmane.org\0" + "From\0Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>\0" + "Subject\0Re: [RFCv3 2/4] dts: zynq: Add devicetree entry for Xilinx Zynq reset controller.\0" "Date\0Tue, 4 Aug 2015 10:13:50 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Moritz Fischer <moritz.fischer-+aYTwkv1SeIAvxtiuMwx3w@public.gmane.org>" + " p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org\0" + "Cc\0mark.rutland-5wv7dgnIgG8@public.gmane.org" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org + pawel.moll-5wv7dgnIgG8@public.gmane.org + ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org + michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + " soren.brinkmann-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org\0" "\00:1\0" "b\0" "On 07/31/2015 03:13 AM, Moritz Fischer wrote:\n" - "> Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>\n" + "> Signed-off-by: Moritz Fischer <moritz.fischer-+aYTwkv1SeIAvxtiuMwx3w@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/zynq-7000.dtsi | 8 ++++++++\n" "> 1 file changed, 8 insertions(+)\n" @@ -27,21 +40,25 @@ "> \t\t\t\treg = <0x100 0x100>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\trstc: rstc at 200 {\n" + "> +\t\t\trstc: rstc@200 {\n" "> +\t\t\t\tcompatible = \"xlnx,zynq-reset\";\n" "> +\t\t\t\treg = <0x200 0x48>;\n" "> +\t\t\t\t#reset-cells = <1>;\n" "> +\t\t\t\tsyscon = <&slcr>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tpinctrl0: pinctrl at 700 {\n" + "> \t\t\tpinctrl0: pinctrl@700 {\n" "> \t\t\t\tcompatible = \"xlnx,pinctrl-zynq\";\n" "> \t\t\t\treg = <0x700 0x200>;\n" "> \n" "\n" - "Acked-by: Michal Simek <michal.simek@xilinx.com>\n" + "Acked-by: Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>\n" "\n" "Thanks,\n" - Michal + "Michal\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 -75e2aa4b8450c9659988fecf300bef20e26086af1c6433afbaa33c8cc708f47d +c30e4a6c3fa4744463397fc1e256c770397e8c684d0940407f14ee6fb1c0881e
diff --git a/a/1.txt b/N2/1.txt index 3a17eda..e02503e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -19,14 +19,14 @@ On 07/31/2015 03:13 AM, Moritz Fischer wrote: > reg = <0x100 0x100>; > }; > -> + rstc: rstc at 200 { +> + rstc: rstc@200 { > + compatible = "xlnx,zynq-reset"; > + reg = <0x200 0x48>; > + #reset-cells = <1>; > + syscon = <&slcr>; > + }; > + -> pinctrl0: pinctrl at 700 { +> pinctrl0: pinctrl@700 { > compatible = "xlnx,pinctrl-zynq"; > reg = <0x700 0x200>; > diff --git a/a/content_digest b/N2/content_digest index fd4714b..796399e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,21 @@ "ref\01438305237-18497-1-git-send-email-moritz.fischer@ettus.com\0" "ref\01438305237-18497-3-git-send-email-moritz.fischer@ettus.com\0" - "From\0michal.simek@xilinx.com (Michal Simek)\0" - "Subject\0[RFCv3 2/4] dts: zynq: Add devicetree entry for Xilinx Zynq reset controller.\0" + "From\0Michal Simek <michal.simek@xilinx.com>\0" + "Subject\0Re: [RFCv3 2/4] dts: zynq: Add devicetree entry for Xilinx Zynq reset controller.\0" "Date\0Tue, 4 Aug 2015 10:13:50 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Moritz Fischer <moritz.fischer@ettus.com>" + " <p.zabel@pengutronix.de>\0" + "Cc\0<mark.rutland@arm.com>" + <devicetree@vger.kernel.org> + <linux@arm.linux.org.uk> + <pawel.moll@arm.com> + <ijc+devicetree@hellion.org.uk> + <michal.simek@xilinx.com> + <linux-kernel@vger.kernel.org> + <robh+dt@kernel.org> + <linux-arm-kernel@lists.infradead.org> + <galak@codeaurora.org> + " <soren.brinkmann@xilinx.com>\0" "\00:1\0" "b\0" "On 07/31/2015 03:13 AM, Moritz Fischer wrote:\n" @@ -27,14 +39,14 @@ "> \t\t\t\treg = <0x100 0x100>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\trstc: rstc at 200 {\n" + "> +\t\t\trstc: rstc@200 {\n" "> +\t\t\t\tcompatible = \"xlnx,zynq-reset\";\n" "> +\t\t\t\treg = <0x200 0x48>;\n" "> +\t\t\t\t#reset-cells = <1>;\n" "> +\t\t\t\tsyscon = <&slcr>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tpinctrl0: pinctrl at 700 {\n" + "> \t\t\tpinctrl0: pinctrl@700 {\n" "> \t\t\t\tcompatible = \"xlnx,pinctrl-zynq\";\n" "> \t\t\t\treg = <0x700 0x200>;\n" "> \n" @@ -44,4 +56,4 @@ "Thanks,\n" Michal -75e2aa4b8450c9659988fecf300bef20e26086af1c6433afbaa33c8cc708f47d +353be3087afec2b45c11788f364de721e17e0b53a9c13540240671e4f3df9567
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.