diff for duplicates of <20160317160656.GA2831@piout.net> diff --git a/a/1.txt b/N1/1.txt index 6c8eace..7726864 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,12 +1,12 @@ On 17/03/2016 at 17:04:00 +0100, Ludovic Desroches wrote : -> From: Cyrille Pitchen <cyrille.pitchen@atmel.com> +> From: Cyrille Pitchen <cyrille.pitchen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > > This SFR node is looked up by the I2S controller driver to tune the > SFR_I2SCLKSEL register. > -> Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com> -> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> -Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> +> Signed-off-by: Cyrille Pitchen <cyrille.pitchen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> +> Signed-off-by: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> +Acked-by: Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> > --- > Documentation/devicetree/bindings/arm/atmel-at91.txt | 2 +- @@ -27,7 +27,7 @@ Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > + <chip> can be "sama5d3", "sama5d4" or "sama5d2". > - reg: Should contain registers location and length > -> sfr at f0038000 { +> sfr@f0038000 { > diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi > index 78996bd..36bb29c 100644 > --- a/arch/arm/boot/dts/sama5d2.dtsi @@ -36,12 +36,12 @@ Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > status = "disabled"; > }; > -> + sfr: sfr at f8030000 { +> + sfr: sfr@f8030000 { > + compatible = "atmel,sama5d2-sfr", "syscon"; > + reg = <0xf8030000 0x98>; > + }; > + -> flx0: flexcom at f8034000 { +> flx0: flexcom@f8034000 { > compatible = "atmel,sama5d2-flexcom"; > reg = <0xf8034000 0x200>; > diff --git a/include/soc/at91/atmel-sfr.h b/include/soc/at91/atmel-sfr.h @@ -55,7 +55,7 @@ Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > + * > + * Copyright (C) 2016 Atmel > + * -> + * Author: Ludovic Desroches <ludovic.desroches@atmel.com> +> + * Author: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as @@ -76,3 +76,7 @@ Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com +-- +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 4b68a2d..c16b69e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,27 @@ "ref\01458230640-26049-1-git-send-email-ludovic.desroches@atmel.com\0" - "From\0alexandre.belloni@free-electrons.com (Alexandre Belloni)\0" - "Subject\0[RESEND PATCH] ARM: at91/dt: sama5d2: add SFR node\0" + "ref\01458230640-26049-1-git-send-email-ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org\0" + "From\0Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Subject\0Re: [RESEND PATCH] ARM: at91/dt: sama5d2: add SFR node\0" "Date\0Thu, 17 Mar 2016 17:06:56 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" + "Cc\0nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org" + plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org + cyrille.pitchen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" "\00:1\0" "b\0" "On 17/03/2016 at 17:04:00 +0100, Ludovic Desroches wrote :\n" - "> From: Cyrille Pitchen <cyrille.pitchen@atmel.com>\n" + "> From: Cyrille Pitchen <cyrille.pitchen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" "> \n" "> This SFR node is looked up by the I2S controller driver to tune the\n" "> SFR_I2SCLKSEL register.\n" "> \n" - "> Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>\n" - "> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>\n" - "Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>\n" + "> Signed-off-by: Cyrille Pitchen <cyrille.pitchen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" + "> Signed-off-by: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" + "Acked-by: Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "\n" "> ---\n" "> Documentation/devicetree/bindings/arm/atmel-at91.txt | 2 +-\n" @@ -34,7 +42,7 @@ "> + <chip> can be \"sama5d3\", \"sama5d4\" or \"sama5d2\".\n" "> - reg: Should contain registers location and length\n" "> \n" - "> \tsfr at f0038000 {\n" + "> \tsfr@f0038000 {\n" "> diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi\n" "> index 78996bd..36bb29c 100644\n" "> --- a/arch/arm/boot/dts/sama5d2.dtsi\n" @@ -43,12 +51,12 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tsfr: sfr at f8030000 {\n" + "> +\t\t\tsfr: sfr@f8030000 {\n" "> +\t\t\t\tcompatible = \"atmel,sama5d2-sfr\", \"syscon\";\n" "> +\t\t\t\treg = <0xf8030000 0x98>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tflx0: flexcom at f8034000 {\n" + "> \t\t\tflx0: flexcom@f8034000 {\n" "> \t\t\t\tcompatible = \"atmel,sama5d2-flexcom\";\n" "> \t\t\t\treg = <0xf8034000 0x200>;\n" "> diff --git a/include/soc/at91/atmel-sfr.h b/include/soc/at91/atmel-sfr.h\n" @@ -62,7 +70,7 @@ "> + *\n" "> + * Copyright (C) 2016 Atmel\n" "> + *\n" - "> + * Author: Ludovic Desroches <ludovic.desroches@atmel.com>\n" + "> + * Author: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" "> + *\n" "> + * This program is free software; you can redistribute it and/or modify\n" "> + * it under the terms of the GNU General Public License version 2 as\n" @@ -82,6 +90,10 @@ "-- \n" "Alexandre Belloni, Free Electrons\n" "Embedded Linux, Kernel and Android engineering\n" - http://free-electrons.com + "http://free-electrons.com\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 -9d2cefdac6ec98e5b9df33335fdd2239b8eca7abdcd2bd82b6f0b4f18a807820 +1ddd5c13cdc7fe4e91c0769d90b64529636f71c0b7b14a0e79cb495e26602dab
diff --git a/a/1.txt b/N2/1.txt index 6c8eace..93ab857 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -27,7 +27,7 @@ Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > + <chip> can be "sama5d3", "sama5d4" or "sama5d2". > - reg: Should contain registers location and length > -> sfr at f0038000 { +> sfr@f0038000 { > diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi > index 78996bd..36bb29c 100644 > --- a/arch/arm/boot/dts/sama5d2.dtsi @@ -36,12 +36,12 @@ Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > status = "disabled"; > }; > -> + sfr: sfr at f8030000 { +> + sfr: sfr@f8030000 { > + compatible = "atmel,sama5d2-sfr", "syscon"; > + reg = <0xf8030000 0x98>; > + }; > + -> flx0: flexcom at f8034000 { +> flx0: flexcom@f8034000 { > compatible = "atmel,sama5d2-flexcom"; > reg = <0xf8034000 0x200>; > diff --git a/include/soc/at91/atmel-sfr.h b/include/soc/at91/atmel-sfr.h diff --git a/a/content_digest b/N2/content_digest index 4b68a2d..440553d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,15 @@ "ref\01458230640-26049-1-git-send-email-ludovic.desroches@atmel.com\0" - "From\0alexandre.belloni@free-electrons.com (Alexandre Belloni)\0" - "Subject\0[RESEND PATCH] ARM: at91/dt: sama5d2: add SFR node\0" + "From\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" + "Subject\0Re: [RESEND PATCH] ARM: at91/dt: sama5d2: add SFR node\0" "Date\0Thu, 17 Mar 2016 17:06:56 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Ludovic Desroches <ludovic.desroches@atmel.com>\0" + "Cc\0nicolas.ferre@atmel.com" + plagnioj@jcrosoft.com + cyrille.pitchen@atmel.com + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " boris.brezillon@free-electrons.com\0" "\00:1\0" "b\0" "On 17/03/2016 at 17:04:00 +0100, Ludovic Desroches wrote :\n" @@ -34,7 +41,7 @@ "> + <chip> can be \"sama5d3\", \"sama5d4\" or \"sama5d2\".\n" "> - reg: Should contain registers location and length\n" "> \n" - "> \tsfr at f0038000 {\n" + "> \tsfr@f0038000 {\n" "> diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi\n" "> index 78996bd..36bb29c 100644\n" "> --- a/arch/arm/boot/dts/sama5d2.dtsi\n" @@ -43,12 +50,12 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tsfr: sfr at f8030000 {\n" + "> +\t\t\tsfr: sfr@f8030000 {\n" "> +\t\t\t\tcompatible = \"atmel,sama5d2-sfr\", \"syscon\";\n" "> +\t\t\t\treg = <0xf8030000 0x98>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tflx0: flexcom at f8034000 {\n" + "> \t\t\tflx0: flexcom@f8034000 {\n" "> \t\t\t\tcompatible = \"atmel,sama5d2-flexcom\";\n" "> \t\t\t\treg = <0xf8034000 0x200>;\n" "> diff --git a/include/soc/at91/atmel-sfr.h b/include/soc/at91/atmel-sfr.h\n" @@ -84,4 +91,4 @@ "Embedded Linux, Kernel and Android engineering\n" http://free-electrons.com -9d2cefdac6ec98e5b9df33335fdd2239b8eca7abdcd2bd82b6f0b4f18a807820 +70674beb2a6b6775b9fbf8a61cb121fbcb629557e125def8d8c172519c5416b8
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.