diff for duplicates of <20160331083441.GY28207@tiger> diff --git a/a/1.txt b/N1/1.txt index 34df73a..da4bb69 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,7 @@ On Wed, Mar 09, 2016 at 06:16:46PM -0800, Stefan Agner wrote: > reg = <0x40050000 0x400>; > }; > -> + scsc: scsc@40052000 { +> + scsc: scsc at 40052000 { > + compatible = "fsl,vf610-scsc"; These new compatible strings should be documented somewhere. @@ -22,35 +22,35 @@ Shawn > + reg = <0x40052000 0x1000>; > + }; > + -> usbphy0: usbphy@40050800 { +> usbphy0: usbphy at 40050800 { > compatible = "fsl,vf610-usbphy"; > reg = <0x40050800 0x400>; > @@ -480,6 +485,13 @@ > status = "disabled"; > }; > -> + wakeup: wkpu@4006a000 { +> + wakeup: wkpu at 4006a000 { > + compatible = "fsl,vf610-wkpu"; > + reg = <0x4006a000 0x1000>; > + interrupts = <92 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&clks VF610_CLK_WKPU>; > + }; > + -> clks: ccm@4006b000 { +> clks: ccm at 4006b000 { > compatible = "fsl,vf610-ccm"; > reg = <0x4006b000 0x1000>; > @@ -600,6 +612,13 @@ > status = "disabled"; > }; > -> + ddrmc: ddrmc@400ae000 { +> + ddrmc: ddrmc at 400ae000 { > + compatible = "fsl,vf610-ddrmc"; > + reg = <0x400ae000 0x400>; > + clocks = <&clks VF610_CLK_DDRMC>; > + clock-names = "ddrc"; > + }; > + -> adc1: adc@400bb000 { +> adc1: adc at 400bb000 { > compatible = "fsl,vf610-adc"; > reg = <0x400bb000 0x1000>; > -- diff --git a/a/content_digest b/N1/content_digest index d8d9439..203d75b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,25 +1,9 @@ "ref\01457576219-7971-1-git-send-email-stefan@agner.ch\0" "ref\01457576219-7971-6-git-send-email-stefan@agner.ch\0" - "From\0Shawn Guo <shawnguo@kernel.org>\0" - "Subject\0Re: [PATCH 05/18] ARM: dts: vf610: add modules required for PM\0" + "From\0shawnguo@kernel.org (Shawn Guo)\0" + "Subject\0[PATCH 05/18] ARM: dts: vf610: add modules required for PM\0" "Date\0Thu, 31 Mar 2016 16:34:41 +0800\0" - "To\0Stefan Agner <stefan@agner.ch>\0" - "Cc\0mturquette@baylibre.com" - sboyd@codeaurora.org - kernel@pengutronix.de - sergeimir@emcraft.com - tglx@linutronix.de - jason@lakedaemon.net - marc.zyngier@arm.com - robh+dt@kernel.org - pawel.moll@arm.com - mark.rutland@arm.com - ijc+devicetree@hellion.org.uk - galak@codeaurora.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - " linux-clk@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, Mar 09, 2016 at 06:16:46PM -0800, Stefan Agner wrote:\n" @@ -36,7 +20,7 @@ "> \t\t\t\treg = <0x40050000 0x400>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tscsc: scsc@40052000 {\n" + "> +\t\t\tscsc: scsc at 40052000 {\n" "> +\t\t\t\tcompatible = \"fsl,vf610-scsc\";\n" "\n" "These new compatible strings should be documented somewhere.\n" @@ -46,35 +30,35 @@ "> +\t\t\t\treg = <0x40052000 0x1000>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tusbphy0: usbphy@40050800 {\n" + "> \t\t\tusbphy0: usbphy at 40050800 {\n" "> \t\t\t\tcompatible = \"fsl,vf610-usbphy\";\n" "> \t\t\t\treg = <0x40050800 0x400>;\n" "> @@ -480,6 +485,13 @@\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\twakeup: wkpu@4006a000 {\n" + "> +\t\t\twakeup: wkpu at 4006a000 {\n" "> +\t\t\t\tcompatible = \"fsl,vf610-wkpu\";\n" "> +\t\t\t\treg = <0x4006a000 0x1000>;\n" "> +\t\t\t\tinterrupts = <92 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t\t\tclocks = <&clks VF610_CLK_WKPU>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tclks: ccm@4006b000 {\n" + "> \t\t\tclks: ccm at 4006b000 {\n" "> \t\t\t\tcompatible = \"fsl,vf610-ccm\";\n" "> \t\t\t\treg = <0x4006b000 0x1000>;\n" "> @@ -600,6 +612,13 @@\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tddrmc: ddrmc@400ae000 {\n" + "> +\t\t\tddrmc: ddrmc at 400ae000 {\n" "> +\t\t\t\tcompatible = \"fsl,vf610-ddrmc\";\n" "> +\t\t\t\treg = <0x400ae000 0x400>;\n" "> +\t\t\t\tclocks = <&clks VF610_CLK_DDRMC>;\n" "> +\t\t\t\tclock-names = \"ddrc\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tadc1: adc@400bb000 {\n" + "> \t\t\tadc1: adc at 400bb000 {\n" "> \t\t\t\tcompatible = \"fsl,vf610-adc\";\n" "> \t\t\t\treg = <0x400bb000 0x1000>;\n" "> -- \n" @@ -82,4 +66,4 @@ "> \n" > -51e88c1da74ce7f014d7e2a06474c7ba98af34a61193791f3472a445dced4e1a +4da56c95d411f6860c92394d0bc003e0c725bde06f98d650b079b2443ad9ebcf
diff --git a/a/1.txt b/N2/1.txt index 34df73a..c6b5a6b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,5 +1,5 @@ On Wed, Mar 09, 2016 at 06:16:46PM -0800, Stefan Agner wrote: -> Signed-off-by: Stefan Agner <stefan@agner.ch> +> Signed-off-by: Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org> > --- > arch/arm/boot/dts/vfxxx.dtsi | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) @@ -56,4 +56,8 @@ Shawn > -- > 2.7.2 > -> +> +-- +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/N2/content_digest index d8d9439..038db30 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,29 +1,30 @@ "ref\01457576219-7971-1-git-send-email-stefan@agner.ch\0" "ref\01457576219-7971-6-git-send-email-stefan@agner.ch\0" - "From\0Shawn Guo <shawnguo@kernel.org>\0" + "ref\01457576219-7971-6-git-send-email-stefan-XLVq0VzYD2Y@public.gmane.org\0" + "From\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" "Subject\0Re: [PATCH 05/18] ARM: dts: vf610: add modules required for PM\0" "Date\0Thu, 31 Mar 2016 16:34:41 +0800\0" - "To\0Stefan Agner <stefan@agner.ch>\0" - "Cc\0mturquette@baylibre.com" - sboyd@codeaurora.org - kernel@pengutronix.de - sergeimir@emcraft.com - tglx@linutronix.de - jason@lakedaemon.net - marc.zyngier@arm.com - robh+dt@kernel.org - pawel.moll@arm.com - mark.rutland@arm.com - ijc+devicetree@hellion.org.uk - galak@codeaurora.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - " linux-clk@vger.kernel.org\0" + "To\0Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org>\0" + "Cc\0mturquette-rdvid1DuHRBWk0Htik3J/w@public.gmane.org" + sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org + sergeimir-qv+LCo8X3VpBDgjK7y7TUQ@public.gmane.org + tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org + jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org + marc.zyngier-5wv7dgnIgG8@public.gmane.org + robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + pawel.moll-5wv7dgnIgG8@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org + galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On Wed, Mar 09, 2016 at 06:16:46PM -0800, Stefan Agner wrote:\n" - "> Signed-off-by: Stefan Agner <stefan@agner.ch>\n" + "> Signed-off-by: Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/vfxxx.dtsi | 19 +++++++++++++++++++\n" "> 1 file changed, 19 insertions(+)\n" @@ -80,6 +81,10 @@ "> -- \n" "> 2.7.2\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 -51e88c1da74ce7f014d7e2a06474c7ba98af34a61193791f3472a445dced4e1a +90d64efe9dd5790cce5358e71843e0e8ccfe5d7766500b9fdf32455a68f2d02b
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.