diff for duplicates of <566FE7FA.6040300@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 9324c07..26ce8fb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,9 +1,9 @@ -Le 05/11/2015 08:39, Wenyou Yang a ?crit : +Le 05/11/2015 08:39, Wenyou Yang a écrit : > Add watchdog node to support SAMA5D4 watchdog. > -> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> +> Signed-off-by: Wenyou Yang <wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> -Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> +Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> And stacked on top of at91-4.5-dt. @@ -23,11 +23,11 @@ Thanks! > }; > }; > -> + watchdog at f8048040 { +> + watchdog@f8048040 { > + status = "okay"; > + }; > + -> uart3: serial at fc008000 { +> uart3: serial@fc008000 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_uart3_default>; > diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi @@ -38,14 +38,14 @@ Thanks! > clocks = <&h32ck>; > }; > -> + watchdog at f8048040 { +> + watchdog@f8048040 { > + compatible = "atmel,sama5d4-wdt"; > + reg = <0xf8048040 0x10>; > + interrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>; > + status = "disabled"; > + }; > + -> sckc at f8048050 { +> sckc@f8048050 { > compatible = "atmel,at91sam9x5-sckc"; > reg = <0xf8048050 0x4>; > @@ -53,3 +53,7 @@ Thanks! -- Nicolas Ferre +-- +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 b5d751c..38e23d1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,28 @@ "ref\01446709170-24500-1-git-send-email-wenyou.yang@atmel.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH] ARM: at91/dt: sama5d2: add watchdog node\0" + "ref\01446709170-24500-1-git-send-email-wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org\0" + "From\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH] ARM: at91/dt: sama5d2: add watchdog node\0" "Date\0Tue, 15 Dec 2015 11:14:18 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Wenyou Yang <wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>" + Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + Jean-Christophe Plagniol-Villard <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> + " Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>\0" + "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" - "Le 05/11/2015 08:39, Wenyou Yang a ?crit :\n" + "Le 05/11/2015 08:39, Wenyou Yang a \303\251crit :\n" "> Add watchdog node to support SAMA5D4 watchdog.\n" "> \n" - "> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>\n" + "> Signed-off-by: Wenyou Yang <wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" "\n" - "Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>\n" + "Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" "\n" "And stacked on top of at91-4.5-dt.\n" "\n" @@ -30,11 +42,11 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> +\t\t\twatchdog at f8048040 {\n" + "> +\t\t\twatchdog@f8048040 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tuart3: serial at fc008000 {\n" + "> \t\t\tuart3: serial@fc008000 {\n" "> \t\t\t\tpinctrl-names = \"default\";\n" "> \t\t\t\tpinctrl-0 = <&pinctrl_uart3_default>;\n" "> diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi\n" @@ -45,20 +57,24 @@ "> \t\t\t\tclocks = <&h32ck>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\twatchdog at f8048040 {\n" + "> +\t\t\twatchdog@f8048040 {\n" "> +\t\t\t\tcompatible = \"atmel,sama5d4-wdt\";\n" "> +\t\t\t\treg = <0xf8048040 0x10>;\n" "> +\t\t\t\tinterrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tsckc at f8048050 {\n" + "> \t\t\tsckc@f8048050 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9x5-sckc\";\n" "> \t\t\t\treg = <0xf8048050 0x4>;\n" "> \n" "\n" "\n" "-- \n" - Nicolas Ferre + "Nicolas Ferre\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 -4550b32d0c63869b4c192e2a0da64ad8949d3e0131429d97cffb85d74fd2c265 +c645573ce905a9008895682e3cc71a3108621cb64e6d40f61c5c663b106b69da
diff --git a/a/1.txt b/N2/1.txt index 9324c07..7fb492d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,4 +1,4 @@ -Le 05/11/2015 08:39, Wenyou Yang a ?crit : +Le 05/11/2015 08:39, Wenyou Yang a écrit : > Add watchdog node to support SAMA5D4 watchdog. > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> @@ -23,11 +23,11 @@ Thanks! > }; > }; > -> + watchdog at f8048040 { +> + watchdog@f8048040 { > + status = "okay"; > + }; > + -> uart3: serial at fc008000 { +> uart3: serial@fc008000 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_uart3_default>; > diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi @@ -38,14 +38,14 @@ Thanks! > clocks = <&h32ck>; > }; > -> + watchdog at f8048040 { +> + watchdog@f8048040 { > + compatible = "atmel,sama5d4-wdt"; > + reg = <0xf8048040 0x10>; > + interrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>; > + status = "disabled"; > + }; > + -> sckc at f8048050 { +> sckc@f8048050 { > compatible = "atmel,at91sam9x5-sckc"; > reg = <0xf8048050 0x4>; > diff --git a/a/content_digest b/N2/content_digest index b5d751c..3e210ce 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,11 +1,22 @@ "ref\01446709170-24500-1-git-send-email-wenyou.yang@atmel.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH] ARM: at91/dt: sama5d2: add watchdog node\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH] ARM: at91/dt: sama5d2: add watchdog node\0" "Date\0Tue, 15 Dec 2015 11:14:18 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Wenyou Yang <wenyou.yang@atmel.com>" + Alexandre Belloni <alexandre.belloni@free-electrons.com> + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + " Russell King <linux@arm.linux.org.uk>\0" + "Cc\0<linux-arm-kernel@lists.infradead.org>" + <linux-kernel@vger.kernel.org> + " <devicetree@vger.kernel.org>\0" "\00:1\0" "b\0" - "Le 05/11/2015 08:39, Wenyou Yang a ?crit :\n" + "Le 05/11/2015 08:39, Wenyou Yang a \303\251crit :\n" "> Add watchdog node to support SAMA5D4 watchdog.\n" "> \n" "> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>\n" @@ -30,11 +41,11 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> +\t\t\twatchdog at f8048040 {\n" + "> +\t\t\twatchdog@f8048040 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tuart3: serial at fc008000 {\n" + "> \t\t\tuart3: serial@fc008000 {\n" "> \t\t\t\tpinctrl-names = \"default\";\n" "> \t\t\t\tpinctrl-0 = <&pinctrl_uart3_default>;\n" "> diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi\n" @@ -45,14 +56,14 @@ "> \t\t\t\tclocks = <&h32ck>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\twatchdog at f8048040 {\n" + "> +\t\t\twatchdog@f8048040 {\n" "> +\t\t\t\tcompatible = \"atmel,sama5d4-wdt\";\n" "> +\t\t\t\treg = <0xf8048040 0x10>;\n" "> +\t\t\t\tinterrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tsckc at f8048050 {\n" + "> \t\t\tsckc@f8048050 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9x5-sckc\";\n" "> \t\t\t\treg = <0xf8048050 0x4>;\n" "> \n" @@ -61,4 +72,4 @@ "-- \n" Nicolas Ferre -4550b32d0c63869b4c192e2a0da64ad8949d3e0131429d97cffb85d74fd2c265 +4d88384e55d0baedf1f0326c1d86d45958adea8601114248467000e94ef922c0
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.