diff for duplicates of <20140416085953.GC11602@dragon> diff --git a/a/1.txt b/N1/1.txt index 0c2b6b9..b59b833 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On Wed, Apr 16, 2014 at 10:19:45AM +0800, Xiubo Li wrote: -> Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com> -> Cc: Shawn Guo <shawn.guo@linaro.org> -> Cc: Jingchang Lu <b35083@freescale.com> +> Signed-off-by: Xiubo Li <Li.Xiubo-KZfg59tc24xl57MIdRCFDg@public.gmane.org> +> Cc: Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> +> Cc: Jingchang Lu <b35083-KZfg59tc24xl57MIdRCFDg@public.gmane.org> > --- > arch/arm/boot/dts/vf610.dtsi | 13 +++++++++++++ > 1 file changed, 13 insertions(+) @@ -14,7 +14,7 @@ On Wed, Apr 16, 2014 at 10:19:45AM +0800, Xiubo Li wrote: > clock-names = "pit"; > }; > -> + ftm0: ftm at 40038000 { +> + ftm0: ftm@40038000 { > + compatible = "fsl,vf610-ftm-timer"; > + reg = <0x40038000 0x2000>; > + interrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>; @@ -33,10 +33,15 @@ Shawn > + }; > + -> wdog at 4003e000 { +> wdog@4003e000 { > compatible = "fsl,vf610-wdt", "fsl,imx21-wdt"; > reg = <0x4003e000 0x1000>; > -- > 1.8.4 > -> +> + +-- +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 c8504ee..ac9961c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,24 @@ "ref\01397614787-8300-1-git-send-email-Li.Xiubo@freescale.com\0" "ref\01397614787-8300-2-git-send-email-Li.Xiubo@freescale.com\0" - "From\0shawn.guo@linaro.org (Shawn Guo)\0" - "Subject\0[RFC][PATCH 1/3] ARM: dts: vf610: Add Freescale FlexTimer Module timer node.\0" + "ref\01397614787-8300-2-git-send-email-Li.Xiubo-KZfg59tc24xl57MIdRCFDg@public.gmane.org\0" + "From\0Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Subject\0Re: [RFC][PATCH 1/3] ARM: dts: vf610: Add Freescale FlexTimer Module timer node.\0" "Date\0Wed, 16 Apr 2014 16:59:54 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Xiubo Li <Li.Xiubo-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\0" + "Cc\0daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org" + tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org + b35083-KZfg59tc24xl57MIdRCFDg@public.gmane.org + r64188-KZfg59tc24xl57MIdRCFDg@public.gmane.org + b40534-KZfg59tc24xl57MIdRCFDg@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On Wed, Apr 16, 2014 at 10:19:45AM +0800, Xiubo Li wrote:\n" - "> Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>\n" - "> Cc: Shawn Guo <shawn.guo@linaro.org>\n" - "> Cc: Jingchang Lu <b35083@freescale.com>\n" + "> Signed-off-by: Xiubo Li <Li.Xiubo-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n" + "> Cc: Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" + "> Cc: Jingchang Lu <b35083-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/vf610.dtsi | 13 +++++++++++++\n" "> 1 file changed, 13 insertions(+)\n" @@ -22,7 +31,7 @@ "> \t\t\t\tclock-names = \"pit\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tftm0: ftm at 40038000 {\n" + "> +\t\t\tftm0: ftm@40038000 {\n" "> +\t\t\t\tcompatible = \"fsl,vf610-ftm-timer\";\n" "> +\t\t\t\treg = <0x40038000 0x2000>;\n" "> +\t\t\t\tinterrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -41,12 +50,17 @@ "\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\twdog at 4003e000 {\n" + "> \t\t\twdog@4003e000 {\n" "> \t\t\t\tcompatible = \"fsl,vf610-wdt\", \"fsl,imx21-wdt\";\n" "> \t\t\t\treg = <0x4003e000 0x1000>;\n" "> -- \n" "> 1.8.4\n" "> \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 -45d270dbf1868111b84132eb7618a44a728bd4f2df6012d748b0353d7c5e1c42 +1ffb888bc4a0295a3da0732d2a1a4c7cfe01f5ebde800e34fb27fe8ee1e1acc2
diff --git a/a/1.txt b/N2/1.txt index 0c2b6b9..276ca0e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -14,7 +14,7 @@ On Wed, Apr 16, 2014 at 10:19:45AM +0800, Xiubo Li wrote: > clock-names = "pit"; > }; > -> + ftm0: ftm at 40038000 { +> + ftm0: ftm@40038000 { > + compatible = "fsl,vf610-ftm-timer"; > + reg = <0x40038000 0x2000>; > + interrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>; @@ -33,7 +33,7 @@ Shawn > + }; > + -> wdog at 4003e000 { +> wdog@4003e000 { > compatible = "fsl,vf610-wdt", "fsl,imx21-wdt"; > reg = <0x4003e000 0x1000>; > -- diff --git a/a/content_digest b/N2/content_digest index c8504ee..ee141d9 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,17 @@ "ref\01397614787-8300-1-git-send-email-Li.Xiubo@freescale.com\0" "ref\01397614787-8300-2-git-send-email-Li.Xiubo@freescale.com\0" - "From\0shawn.guo@linaro.org (Shawn Guo)\0" - "Subject\0[RFC][PATCH 1/3] ARM: dts: vf610: Add Freescale FlexTimer Module timer node.\0" + "From\0Shawn Guo <shawn.guo@linaro.org>\0" + "Subject\0Re: [RFC][PATCH 1/3] ARM: dts: vf610: Add Freescale FlexTimer Module timer node.\0" "Date\0Wed, 16 Apr 2014 16:59:54 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Xiubo Li <Li.Xiubo@freescale.com>\0" + "Cc\0<daniel.lezcano@linaro.org>" + <tglx@linutronix.de> + <b35083@freescale.com> + <r64188@freescale.com> + <b40534@freescale.com> + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On Wed, Apr 16, 2014 at 10:19:45AM +0800, Xiubo Li wrote:\n" @@ -22,7 +30,7 @@ "> \t\t\t\tclock-names = \"pit\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tftm0: ftm at 40038000 {\n" + "> +\t\t\tftm0: ftm@40038000 {\n" "> +\t\t\t\tcompatible = \"fsl,vf610-ftm-timer\";\n" "> +\t\t\t\treg = <0x40038000 0x2000>;\n" "> +\t\t\t\tinterrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -41,7 +49,7 @@ "\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\twdog at 4003e000 {\n" + "> \t\t\twdog@4003e000 {\n" "> \t\t\t\tcompatible = \"fsl,vf610-wdt\", \"fsl,imx21-wdt\";\n" "> \t\t\t\treg = <0x4003e000 0x1000>;\n" "> -- \n" @@ -49,4 +57,4 @@ "> \n" > -45d270dbf1868111b84132eb7618a44a728bd4f2df6012d748b0353d7c5e1c42 +3717db498725f1a66c46d8cd788fc9a3dbe52504f63ebbb57edef26da676850e
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.